Rework debugging GHA.

BrowserWorks · May 13, 2024 · 6f4550f · 6f4550f
1 parent 56ba131
commit 6f4550f
Showing 1 changed file with 36 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -103,7 +103,7 @@ jobs:
       - name: "\U0001F4BF Build dependencies"
         run: |
           sudo apt install msitools
-          rustup update
+          rustup default 1.77.2
           rustup target add x86_64-pc-windows-msvc
           curl -L "https://www.7-zip.org/a/7z2300-linux-x64.tar.xz" | tar xJ
           sudo mv 7zz /usr/local/bin/7z
@@ -124,9 +124,6 @@ jobs:
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
           mkdir -p $HOME/win-cross
           tar -xvf clang-17.tar.zst -C $HOME/win-cross
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: "\U0001F4E3 Override version_display.txt"
@@ -172,6 +169,10 @@ jobs:
           name: windows-${{ env.ARCH }}-stage-1-${{ github.run_id }}
           path: |
             obj-${{ env.ARCH }}/dist/waterfox
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   build-windows-x64-stage-2:
     name: Windows Stage 2
     defaults:
@@ -190,9 +191,6 @@ jobs:
         run: |
           curl -L https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe --output MozillaBuildSetup-Latest.exe
           7z x MozillaBuildSetup-Latest.exe -o/c/mozilla-build
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: ⏬ Download Stage 1 Windows artifact
@@ -217,6 +215,10 @@ jobs:
           path: |
             merged.profdata
             en-US.log
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   build-windows-x64-stage-3:
     name: Windows Stage 3
     needs:
@@ -256,7 +258,7 @@ jobs:
       - name: "\U0001F4BF Build dependencies"
         run: |
           sudo apt install msitools
-          rustup update
+          rustup default 1.77.2
           rustup target add x86_64-pc-windows-msvc
           curl -L https://github.com/ebourg/jsign/releases/download/5.0/jsign_5.0_all.deb --output jsign_5.0_all.deb
           sudo apt install -y ./jsign_5.0_all.deb
@@ -279,9 +281,6 @@ jobs:
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
           mkdir -p $HOME/win-cross
           tar -xvf clang-17.tar.zst -C $HOME/win-cross
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: "\U0001F4E3 Override version_display.txt"
@@ -471,6 +470,10 @@ jobs:
             Install\ Waterfox.exe
             waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
             update.xml
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   build-macos-multi-stage-1:
     name: macOS Stage 1
     runs-on:
@@ -515,7 +518,7 @@ jobs:
       - name: "\U0001F4BF Build dependencies"
         run: |
           sudo apt install nasm
-          rustup update
+          rustup default 1.77.2
           rustup target add ${{ matrix.arch }}
           curl -L "https://www.7-zip.org/a/7z2300-linux-x64.tar.xz" | tar xJ
           sudo mv 7zz /usr/local/bin/7z
@@ -535,9 +538,6 @@ jobs:
           tar -xvf macos-cross.tar.zst -C $HOME/
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
           tar -xvf clang-17.tar.zst -C $HOME/macos-cross
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: "\U0001F4E3 Override version_display.txt"
@@ -581,6 +581,10 @@ jobs:
             ./obj-${{ matrix.arch }}/dist/waterfox/*.app
             ./obj-${{ matrix.arch }}/dist/host/bin/mar
           retention-days: 1
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   build-macos-multi-stage-2:
     name: macOS Stage 2
     runs-on: ${{ matrix.runs-on }}
@@ -597,9 +601,6 @@ jobs:
     needs:
       - build-macos-multi-stage-1
     steps:
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: ⏬ Download Stage 1 macOS artifact
@@ -644,6 +645,10 @@ jobs:
           path: |
             merged.profdata
             en-US.log
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   build-macos-multi-stage-3:
     name: macOS Stage 3
     runs-on:
@@ -690,7 +695,7 @@ jobs:
       - name: "\U0001F4BF Build dependencies"
         run: |
           sudo apt install nasm
-          rustup update
+          rustup default 1.77.2
           rustup target add ${{ matrix.arch }}
           curl -L "https://www.7-zip.org/a/7z2300-linux-x64.tar.xz" | tar xJ
           sudo mv 7zz /usr/local/bin/7z
@@ -710,9 +715,6 @@ jobs:
           tar -xvf macos-cross.tar.zst -C $HOME/
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
           tar -xvf clang-17.tar.zst -C $HOME/macos-cross
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: "\U0001F4E3 Override version_display.txt"
@@ -764,6 +766,10 @@ jobs:
             ./obj-${{ matrix.arch }}/dist/waterfox/*.app
             ./obj-${{ matrix.arch }}/dist/host/bin/mar
           retention-days: 1
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   macos-unify:
     name: macOS Universal
     if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
@@ -774,9 +780,6 @@ jobs:
       ARCH-X64: x86_64-apple-darwin
       ARCH-ARM64: aarch64-apple-darwin
     steps:
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: "\U0001F4E3 Override version_display.txt"
@@ -907,6 +910,10 @@ jobs:
             Waterfox ${{ env.VERSION_DISPLAY }}.dmg.sha512
             waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
             update.xml
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
   build-linux-x64:
     name: Linux
     runs-on:
@@ -941,9 +948,6 @@ jobs:
         run: |
           curl -L "https://www.7-zip.org/a/7z2300-linux-x64.tar.xz" | tar xJ
           sudo mv 7zz /usr/local/bin/7z
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/[email protected]
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v4
       - name: "\U0001F4E3 Override version_display.txt"
@@ -1066,6 +1070,10 @@ jobs:
           sed -i "s/SIZE/$SIZE/g" update.xml
 
           sed -i "s/HASH/"$SHA512"/g" update.xml
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/[email protected]
+        timeout-minutes: 15
       - name: "\U0001F199 Upload artifact"
         if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
         uses: actions/upload-artifact@v4