Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
larseggert committed Oct 9, 2024
1 parent 35c7b51 commit 4594388
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/firefox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,14 @@ env:
FIREFOX: Firefox

jobs:
firefox:
gecko:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
type: [debug]
flavor: [glue]
include:
- type: ${{ github.event.pull_request.draft == false && 'release' || 'debug' }}
- flavor: ${{github.event.inputs.build_browser == true && 'browser' || 'glue' }}
- type: ${{ github.event.inputs.build_browser == true && 'release' || 'debug' }}
runs-on: ${{ matrix.os }}
defaults:
run:
Expand All @@ -46,7 +44,7 @@ jobs:
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- name: Maximize build space
if: runner.os == 'Linux' && matrix.flavor == 'browser'
if: runner.os == 'Linux' && github.event.inputs.build_browser == true
run: |
sudo rm -rf /usr/local/lib/android || true
sudo rm -rf /usr/share/dotnet || true
Expand Down Expand Up @@ -118,7 +116,7 @@ jobs:
./mach vendor rust --ignore-modified
- name: Build Firefox
if: matrix.flavor == 'browser'
if: github.event.inputs.build_browser == true
env:
NAME: ${{ runner.os == 'macOS' && 'Nightly' || 'bin' }}
TYPE: ${{ runner.os == 'macOS' && matrix.type == 'debug' && 'Debug' || '' }}
Expand All @@ -131,7 +129,7 @@ jobs:
./mach build && tar -cf "../$FIREFOX.tar" -C "../$FIREFOX/dist" "$NAME$TYPE$EXT"
- name: Build neqo_glue
if: matrix.flavor == 'glue'
if: github.event.inputs.build_browser == false
run: |
cd mozilla-unified
# Work around "ERROR: WINDOWSSDKDIR cannot be set when using the bootstrapped WINSYSROOT"
Expand All @@ -140,19 +138,19 @@ jobs:
./mach build netwerk
- name: Export binary
if: matrix.flavor == 'browser'
if: github.event.inputs.build_browser == true
id: upload
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: ${{ runner.os }}-${{ env.FIREFOX }}-${{ matrix.type }}.tgz
path: ${{ env.FIREFOX }}.tar
compression-level: 9

- if: matrix.flavor == 'browser'
- if: github.event.inputs.build_browser == true
run: echo "${{ steps.upload.outputs.artifact-url }}" >> artifact

- name: Export artifact URL
if: matrix.flavor == 'browser'
if: github.event.inputs.build_browser == true
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: artifact-${{ runner.os }}-${{ env.FIREFOX }}-${{ matrix.type }}
Expand All @@ -161,8 +159,8 @@ jobs:

comment:
name: Comment on PR
if: github.event.pull_request.draft == false
needs: firefox
if: github.event.inputs.build_browser == true
needs: gecko
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
Expand Down

0 comments on commit 4594388

Please sign in to comment.