ci/all: try to attest all of our binaries as well, move to a smaller …

…out dir so we can
e-dant · May 26, 2024 · 3dc415c · 3dc415c
1 parent d004eb9
commit 3dc415c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -35,14 +35,14 @@ jobs:
       - run: |
           export ANDROID_NDK_HOME=$(find /usr/local/lib/android/sdk/ndk -type d -maxdepth 1 -name '${{matrix.android-ndk-major-version}}*' | head -n 1)
           tool/build --verbose --platform-${{matrix.target-platform}} --no-build-test --no-run
-      - run: tool/bundle-artifacts out/${{matrix.target-double}} ${{matrix.target-platform}}
+      - run: tool/bundle-artifacts minimal-artifacts/${{matrix.target-double}} ${{matrix.target-platform}}
       - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.target-double}}.built-on-${{matrix.os}}.used-ndk-${{matrix.android-ndk-major-version}}
-          path: out/${{matrix.target-double}}.tar.gz
+          path: minimal-artifacts/${{matrix.target-double}}.tar.gz
       - uses: actions/attest-build-provenance@v1
         with:
-          subject-path: out/${{matrix.target-double}}.tar.gz
+          subject-path: minimal-artifacts
       - run: tool/test/all
       - run: tool/build --verbose --no-build --no-run-perf
       - run: tool/build --verbose --no-build --no-run-unit

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -34,14 +34,14 @@ jobs:
           key: cache.${{matrix.target-double}}.${{matrix.os}}
       - uses: chetan/git-restore-mtime-action@v2
       - run: tool/build --verbose --no-run
-      - run: tool/bundle-artifacts out/${{matrix.target-double}} ${{matrix.target-platform}}
+      - run: tool/bundle-artifacts minimal-artifacts/${{matrix.target-double}} ${{matrix.target-platform}}
       - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.target-double}}.built-on-${{matrix.os}}
-          path: out/${{matrix.target-double}}.tar.gz
+          path: minimal-artifacts/${{matrix.target-double}}.tar.gz
       - uses: actions/attest-build-provenance@v1
         with:
-          subject-path: out/${{matrix.target-double}}.tar.gz
+          subject-path: minimal-artifacts
       - run: tool/test/all
       - run: tool/build --verbose --no-build --no-run-perf
       - run: tool/build --verbose --no-build --no-run-unit

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -32,14 +32,14 @@ jobs:
           key: cache.${{matrix.target-double}}.${{matrix.os}}
       - uses: chetan/git-restore-mtime-action@v2
       - run: tool/build --verbose --no-run
-      - run: tool/bundle-artifacts out/${{matrix.target-double}} ${{matrix.target-platform}}
+      - run: tool/bundle-artifacts minimal-artifacts/${{matrix.target-double}} ${{matrix.target-platform}}
       - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.target-double}}.built-on-${{matrix.os}}
-          path: out/${{matrix.target-double}}.tar.gz
+          path: minimal-artifacts/${{matrix.target-double}}.tar.gz
       - uses: actions/attest-build-provenance@v1
         with:
-          subject-path: out/${{matrix.target-double}}.tar.gz
+          subject-path: minimal-artifacts
       - run: tool/test/all
       - run: tool/build --verbose --no-build --no-run-perf
       - run: tool/build --verbose --no-build --no-run-unit

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -51,14 +51,17 @@ jobs:
           cmake -S . -B out/${{matrix.target-platform}}
           cmake --build out/${{matrix.target-platform}} --target wtr.test_watcher --config Debug
           cmake --build out/${{matrix.target-platform}} --target wtr.test_watcher --config Release
-      - run: tool/bundle-artifacts out/${{matrix.target-double}} ${{matrix.target-platform}}
+      - shell: bash
+        run: tool/build --show-artifacts
+      - shell: bash
+        run: tool/bundle-artifacts minimal-artifacts/${{matrix.target-double}} ${{matrix.target-platform}}
       - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.target-double}}.built-on-${{matrix.os}}
-          path: out/${{matrix.target-double}}.tar.gz
+          path: minimal-artifacts/${{matrix.target-double}}.tar.gz
       - uses: actions/attest-build-provenance@v1
         with:
-          subject-path: out/${{matrix.target-double}}.tar.gz
+          subject-path: minimal-artifacts
       - shell: bash
         env:
           VERBOSE: 1