Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplication of node version for ease of maintenance #3283

Merged
merged 1 commit into from
Dec 1, 2024
Merged

Remove duplication of node version for ease of maintenance #3283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup pnpm
run: npm install -g pnpm
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build-data]
steps:
- name: Checkout repository
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
Expand All @@ -168,7 +168,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup pnpm
run: npm install -g pnpm
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup Git
run: |
Expand Down Expand Up @@ -339,7 +339,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup Git
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/macos-release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
mac-build:
name: Build macOS - ${{ matrix.arch }}
runs-on: macos-14

strategy:
fail-fast: false
matrix:
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup Python
uses: actions/setup-python@v5
Expand All @@ -55,17 +55,17 @@ jobs:
export PATH="$(python3 -m site --user-base)/bin":$PATH
python3 -m pip install --user mercurial

rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
rm '/usr/local/bin/python3.11-config' '/usr/local/bin/python3.12-config' '/usr/local/bin/python3-config'

brew install watchman

curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
source $HOME/.cargo/env

if test "${{ matrix.arch }}" = "aarch64"; then
rustup target add aarch64-apple-darwin
else
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup pnpm
run: npm install -g pnpm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/twilight-release-schedule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

# TODO:
2 changes: 1 addition & 1 deletion .github/workflows/windows-profile-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup Git
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'

- name: Setup pnpm
run: npm install -g pnpm
Expand Down
6 changes: 3 additions & 3 deletions configs/common/mozconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ ac_add_options --enable-application=browser

if test "$ZEN_RELEASE"; then
ac_add_options --enable-bootstrap

ac_add_options --enable-release
ac_add_options --disable-debug
ac_add_options --disable-debug-symbols
ac_add_options --disable-debug-js-modules
ac_add_options --disable-tests

ac_add_options --disable-vtune

ac_add_options --enable-rust-simd
ac_add_options --enable-wasm-simd

mk_add_options MOZ_PARALLEL_COMPILE=1

ac_add_options --enable-proxy-bypass-protection
Expand Down