Skip to content

Commit

Permalink
Update GHA to build with Ubuntu 22.04 for Linux.
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlex94 committed Nov 12, 2024
1 parent b4e6eaf commit be1a71d
Showing 1 changed file with 7 additions and 22 deletions.
29 changes: 7 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
versionout: "${{ steps.versionexport.outputs.version }}"
steps:
- name: Run sccache-cache
uses: mozilla-actions/[email protected].5
uses: mozilla-actions/[email protected].6
- name: "\U0001F4BF Build dependencies"
run: |
sudo apt update
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
contents: read
steps:
- name: Run sccache-cache
uses: mozilla-actions/[email protected].5
uses: mozilla-actions/[email protected].6
- name: "\U0001F4BF Build dependencies"
run: |
sudo apt update
Expand Down Expand Up @@ -411,7 +411,7 @@ jobs:
SCCACHE_GHA_ENABLED: "true"
steps:
- name: Run sccache-cache
uses: mozilla-actions/[email protected].5
uses: mozilla-actions/[email protected].6
- name: "\U0001F4BF Build dependencies"
run: |
sudo apt update
Expand Down Expand Up @@ -493,21 +493,6 @@ jobs:
sudo spctl --add ./obj-${{ matrix.arch }}/dist/waterfox/Waterfox.app
find ./obj-${{ matrix.arch }}/dist/waterfox/ -type f -exec /bin/sh -c "file {} | grep -q executable && chmod +x {}" \;
rm .mozconfig || true
rm /usr/local/bin/2to3 || true
rm /usr/local/bin/2to3-3.11 || true
rm /usr/local/bin/2to3-3.12 || true
rm /usr/local/bin/idle3 || true
rm /usr/local/bin/idle3.11 || true
rm /usr/local/bin/idle3.12 || true
rm /usr/local/bin/pydoc3 || true
rm /usr/local/bin/pydoc3.11 || true
rm /usr/local/bin/pydoc3.12 || true
rm /usr/local/bin/python3 || true
rm /usr/local/bin/python3-config || true
rm /usr/local/bin/python3.11 || true
rm /usr/local/bin/python3.12 || true
rm /usr/local/bin/python3.11-config || true
rm /usr/local/bin/python3.12-config || true
./mach --no-interactive bootstrap --application-choice=browser
LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary ./obj-${{ matrix.arch }}/dist/waterfox/Waterfox.app/Contents/MacOS/waterfox
- name: "\U0001F199 Upload Stage 2 Artifact"
Expand Down Expand Up @@ -539,7 +524,7 @@ jobs:
SCCACHE_GHA_ENABLED: "true"
steps:
- name: Run sccache-cache
uses: mozilla-actions/[email protected].5
uses: mozilla-actions/[email protected].6
- name: "\U0001F4BF Build dependencies"
run: |
sudo apt update
Expand Down Expand Up @@ -737,7 +722,7 @@ jobs:
build-linux-x64:
name: Linux
runs-on:
- warp-custom-16x-ubuntu-24
- warp-custom-16x-ubuntu-22
concurrency:
group: "${{ github.head_ref }}-linux-x64"
cancel-in-progress: true
Expand All @@ -749,7 +734,7 @@ jobs:
SCCACHE_GHA_ENABLED: "true"
steps:
- name: Run sccache-cache
uses: mozilla-actions/[email protected].5
uses: mozilla-actions/[email protected].6
- name: "\U0001F4BF Setup build packages"
run: |
curl -L "https://www.7-zip.org/a/7z2408-linux-x64.tar.xz" | tar xJ
Expand Down Expand Up @@ -814,7 +799,7 @@ jobs:
if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
./mach package-multi-locale --locales ar cs da de el en-GB en-US es-ES es-MX fr hu id it ja ko lt nl nn-NO pl pt-BR pt-PT ru sv-SE th vi zh-CN zh-TW
fi
python3 -m pip install --break-system-packages cryptography
python3 -m pip install cryptography
echo "${{ secrets.SIGN_BASE64 }}" | base64 --decode > sign.zip
unzip -q sign.zip
rm sign.zip
Expand Down

0 comments on commit be1a71d

Please sign in to comment.