simplify

Author: gnalh

.github/workflows/pull_request.yml

@@ -18,8 +18,8 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  test:
-    name: Test for ${{ matrix.platform.target }}
+  build_release:
+    name: Build CLI for ${{ matrix.platform.target }}
     strategy:
       matrix:
         platform:
@@ -68,67 +68,36 @@ jobs:
         with:
           lfs: "true"
 
-      - name: Setup Xcode 16
-        if: contains(matrix.platform.os-name, 'darwin')
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: 16
-
       - name: Setup Rust & Cargo
         uses: ./.github/actions/setup_rust_cargo
 
-      # This is a canary test to ensure that the github actions crate is working
-      # as expected in a real environment. If this fails, we should investigate
-      # why the github actions crate is not working as expected. This test relies
-      # on the github actions crate to be able to extract the job ID from the logs,
-      # which is an undocumented feature that can break at any moment.
-      - name: canary - Test github actions crate
-        shell: bash
-        run: |
-          cargo run --bin github-actions -- -v
-          if [[ "$?" -ne 0 ]]; then
-            echo "Failed to run github-actions crate"
-            exit 1
-          fi
-
-      - name: Run tests
-        uses: ./.github/actions/run_tests
-        id: tests
-        continue-on-error: true
+      - name: Build darwin target
+        uses: ./.github/actions/build_cli_macos_target
+        if: contains(matrix.platform.os-name, 'darwin')
         with:
           target: ${{ matrix.platform.target }}
-          codecov-token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Extract step outcome
-        shell: bash
-        id: extract
-        run: |
-          if [[ "${{steps.tests.outcome}}" == "failure" ]]; then
-            echo "test-step-outcome=1" >> $GITHUB_OUTPUT
-            echo "1" > test-outcome.txt
-          else
-            echo "test-step-outcome=0" >> $GITHUB_OUTPUT
-            echo "0" > test-outcome.txt
-          fi
+          profile: release
+          force-sentry-dev: true
 
-      - name: Upload test outcome
-        uses: actions/upload-artifact@v4
-        if: always()
+      - name: Build unix/Windows target
+        uses: ./.github/actions/build_cli_linux_windows_target
+        if: ${{ !contains(matrix.platform.os-name, 'darwin') }}
         with:
-          name: test-outcome-${{ matrix.platform.target }}
-          path: test-outcome.txt
-          retention-days: 1
+          target: ${{ matrix.platform.target }}
+          profile: release
+          force-sentry-dev: true
 
-      - name: Upload junit files
+      - name: Upload built binary
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: junit-${{ matrix.platform.target }}
-          path: target/**/*junit.xml
+          name: binary-${{ matrix.platform.target }}
+          path: target/${{ matrix.platform.target }}/release/trunk-analytics-cli*
           retention-days: 1
 
-  build_release:
-    name: Build CLI for ${{ matrix.platform.target }}
+  test:
+    name: Test for ${{ matrix.platform.target }}
+    needs: [build_release]
     strategy:
       matrix:
         platform:
@@ -186,72 +155,27 @@ jobs:
       - name: Setup Rust & Cargo
         uses: ./.github/actions/setup_rust_cargo
 
-      - name: Build darwin target
-        uses: ./.github/actions/build_cli_macos_target
-        if: contains(matrix.platform.os-name, 'darwin')
-        with:
-          target: ${{ matrix.platform.target }}
-          profile: release
-          force-sentry-dev: true
+      # This is a canary test to ensure that the github actions crate is working
+      # as expected in a real environment. If this fails, we should investigate
+      # why the github actions crate is not working as expected. This test relies
+      # on the github actions crate to be able to extract the job ID from the logs,
+      # which is an undocumented feature that can break at any moment.
+      - name: canary - Test github actions crate
+        shell: bash
+        run: |
+          cargo run --bin github-actions -- -v
+          if [[ "$?" -ne 0 ]]; then
+            echo "Failed to run github-actions crate"
+            exit 1
+          fi
 
-      - name: Build unix/Windows target
-        uses: ./.github/actions/build_cli_linux_windows_target
-        if: ${{ !contains(matrix.platform.os-name, 'darwin') }}
+      - name: Run tests
+        uses: ./.github/actions/run_tests
+        id: tests
+        continue-on-error: true
         with:
           target: ${{ matrix.platform.target }}
-          profile: release
-          force-sentry-dev: true
-
-      - name: Upload built binary
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: binary-${{ matrix.platform.target }}
-          path: target/${{ matrix.platform.target }}/release/trunk-analytics-cli*
-          retention-days: 1
-
-  upload_results:
-    name: Upload results for ${{ matrix.platform.target }}
-    needs: [test, build_release]
-    strategy:
-      matrix:
-        platform:
-          - os-name: linux-x86_64
-            runs-on: ubuntu-latest
-            target: x86_64-unknown-linux-musl
-
-          - os-name: linux-aarch64
-            runs-on: ubuntu-24.04-arm
-            target: aarch64-unknown-linux-musl
-
-          - os-name: x86_64-darwin
-            runs-on: macos-latest
-            target: x86_64-apple-darwin
-
-          - os-name: aarch64-darwin
-            runs-on: macos-latest
-            target: aarch64-apple-darwin
-
-          - os-name: windows-x86_64
-            runs-on: public-amd64-4xlarge-dind-germany
-            target: x86_64-pc-windows-gnu
-
-    runs-on: ${{ matrix.platform.runs-on }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download test outcome
-        uses: actions/download-artifact@v4
-        with:
-          name: test-outcome-${{ matrix.platform.target }}
-          path: ./
-
-      - name: Download junit files
-        uses: actions/download-artifact@v4
-        with:
-          name: junit-${{ matrix.platform.target }}
-          path: target/
+          codecov-token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Download built binary
         uses: actions/download-artifact@v4
@@ -272,12 +196,11 @@ jobs:
         # Windows binaries are tested in the release workflow on actual Windows runners
         if: ${{ !contains(matrix.platform.target, 'illumos') && !contains(matrix.platform.os-name, 'windows') }}
         run: |
-          TEST_OUTCOME=$(cat test-outcome.txt)
           target/${{ matrix.platform.target }}/release/trunk-analytics-cli upload \
              --junit-paths ${{ github.workspace }}/target/**/*junit.xml \
              --org-url-slug trunk-staging-org \
              --token ${{ secrets.TRUNK_STAGING_ORG_API_TOKEN }} \
-             --test-process-exit-code $TEST_OUTCOME
+             --test-process-exit-code ${{ steps.tests.outcome }}
 
       - name: Upload results to prod using built CLI
         shell: bash