ci: use tool/build

e-dant · Jul 4, 2023 · 0c1b37d · 0c1b37d
1 parent e343bbf
commit 0c1b37d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 30 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -47,4 +47,4 @@ jobs:
 
       - name: Build
         run: |
-          build/build android --no-build-test --no-run-test --no-run-bench
+          tool/build --platform-android --no-build-test --no-build-bench --no-run-test --no-run-bench
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -40,18 +40,8 @@ jobs:
       - name: Build
         run: |
           export CXX="$(which "${{matrix.cxx_compiler}}")"
-          build/build --no-run-test --no-run-bench
+          tool/build --no-run
 
       - name: Test
         run: |
-          build/build --no-build-release --no-build-debug --no-build-test
-          build/out/this/release/wtr.watcher . -s 5 &
-          build/out/this/debug/asan/wtr.watcher . -s 5 &
-          build/out/this/debug/msan/wtr.watcher . -s 5 &
-          build/out/this/debug/ubsan/wtr.watcher . -s 5 &
-          build/out/this/debug/nosan/wtr.watcher . -s 5 &
-          build/out/this/release/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/asan/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/msan/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/ubsan/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/nosan/wtr.watcher "$PWD" -s 5 &
+          tool/build --no-build
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -2,6 +2,17 @@
 # Ubuntu Workflow
 #
 
+# In the 'Test' step, we could do something like this:
+#   build/out/this/Release/wtr.watcher . -s 5 &
+#   build/out/this/Release/wtr.watcher.asan . -s 5 &
+#   build/out/this/Release/wtr.watcher.ubsan . -s 5 &
+#   build/out/this/Debug/wtr.watcher . -s 5 &
+#   build/out/this/Debug/wtr.watcher.asan . -s 5 &
+#   build/out/this/Debug/wtr.watcher.ubsan . -s 5 &
+#   wait
+# To see if the cli works as intended. But, if they don't finish,
+# that might be a lot of money if I forget to stop the runner...
+
 # https://github.com/filipdutescu/modern-cpp-template/blob/master/.github/workflows
 
 name: Ubuntu
@@ -40,17 +51,8 @@ jobs:
       - name: Build
         run: |
           export CXX=$(which ${{matrix.cxx_compiler}})
-          build/build --no-run-test --no-run-bench
+          tool/build --no-run
 
       - name: Test
         run: |
-          build/build --no-build-release --no-build-debug --no-build-test
-          build/out/this/release/wtr.watcher . -s 5 &
-          build/out/this/debug/asan/wtr.watcher . -s 5 &
-          build/out/this/debug/ubsan/wtr.watcher . -s 5 &
-          build/out/this/debug/nosan/wtr.watcher . -s 5 &
-          build/out/this/release/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/asan/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/ubsan/wtr.watcher "$PWD" -s 5 &
-          build/out/this/debug/nosan/wtr.watcher "$PWD" -s 5 &
-
+          tool/build --no-build
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -55,12 +55,8 @@ jobs:
 
       - name: Build
         run: |
-          bash -c 'build/build --no-run-test --no-run-bench'
+          bash -c 'tool/build --no-run'
 
       - name: Test
         run: |
-          bash -c 'build/build --no-build-release --no-build-debug --no-build-test'
-          bash -c 'build/out/this/release/wtr.watcher.exe . -s 5 &'
-          bash -c 'build/out/this/debug/nosan/wtr.watcher.exe . -s 5 &'
-          bash -c 'eval build/out/this/release/wtr.watcher.exe "$PWD" -s 5 &'
-          bash -c 'eval build/out/this/debug/nosan/wtr.watcher.exe "$PWD" -s 5 &'
+          bash -c 'tool/build --no-build'