Skip to content

Commit

Permalink
Revert to BuildJet.
Browse files Browse the repository at this point in the history
WarpBuild seems to be having issues with Ubuntu images.
  • Loading branch information
MrAlex94 committed Sep 4, 2024
1 parent b850ba8 commit 692f5a7
Showing 1 changed file with 5 additions and 37 deletions.
42 changes: 5 additions & 37 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
build-windows-x64-stage-1:
name: Windows Stage 1
runs-on:
- warp-ubuntu-latest-x64-16x
- buildjet-16vcpu-ubuntu-2204
concurrency:
group: "${{ github.head_ref }}-windows-x64-stage-1"
cancel-in-progress: true
Expand Down Expand Up @@ -169,10 +169,6 @@ jobs:
name: windows-${{ env.ARCH }}-stage-1-${{ github.run_id }}
path: |
obj-${{ env.ARCH }}/dist/waterfox
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
build-windows-x64-stage-2:
name: Windows Stage 2
defaults:
Expand Down Expand Up @@ -215,16 +211,12 @@ jobs:
path: |
merged.profdata
en-US.log
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
build-windows-x64-stage-3:
name: Windows Stage 3
needs:
- build-windows-x64-stage-2
runs-on:
- warp-ubuntu-latest-x64-16x
- buildjet-16vcpu-ubuntu-2204
concurrency:
group: "${{ github.head_ref }}-windows-x64-stage-3"
cancel-in-progress: true
Expand Down Expand Up @@ -470,14 +462,10 @@ jobs:
Install\ Waterfox.exe
waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
update.xml
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
build-macos-multi-stage-1:
name: macOS Stage 1
runs-on:
- warp-ubuntu-latest-x64-16x
- buildjet-16vcpu-ubuntu-2204
strategy:
matrix:
arch:
Expand Down Expand Up @@ -581,10 +569,6 @@ jobs:
./obj-${{ matrix.arch }}/dist/waterfox/*.app
./obj-${{ matrix.arch }}/dist/host/bin/mar
retention-days: 1
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
build-macos-multi-stage-2:
name: macOS Stage 2
runs-on: ${{ matrix.runs-on }}
Expand Down Expand Up @@ -645,14 +629,10 @@ jobs:
path: |
merged.profdata
en-US.log
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
build-macos-multi-stage-3:
name: macOS Stage 3
runs-on:
- warp-ubuntu-latest-x64-16x
- buildjet-16vcpu-ubuntu-2204
needs:
- build-macos-multi-stage-2
strategy:
Expand Down Expand Up @@ -766,10 +746,6 @@ jobs:
./obj-${{ matrix.arch }}/dist/waterfox/*.app
./obj-${{ matrix.arch }}/dist/host/bin/mar
retention-days: 1
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
macos-unify:
name: macOS Universal
if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
Expand Down Expand Up @@ -910,14 +886,10 @@ jobs:
Waterfox ${{ env.VERSION_DISPLAY }}.dmg.sha512
waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
update.xml
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
build-linux-x64:
name: Linux
runs-on:
- warp-ubuntu-latest-x64-16x
- buildjet-16vcpu-ubuntu-2204
concurrency:
group: "${{ github.head_ref }}-linux-x64"
cancel-in-progress: true
Expand Down Expand Up @@ -1072,10 +1044,6 @@ jobs:
sed -i "s/SIZE/$SIZE/g" update.xml
sed -i "s/HASH/"$SHA512"/g" update.xml
- name: πŸ› Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
timeout-minutes: 15
- name: "\U0001F199 Upload artifact"
if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
uses: actions/upload-artifact@v4
Expand Down

0 comments on commit 692f5a7

Please sign in to comment.