From c20cc841da9c05d67bcb28d58d8a5e16f6e2771f Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 18:10:29 +0200 Subject: [PATCH 1/7] dev(ci): add `--break-system-packages` to `pip install` Partially resolves #8025 --- .github/workflows/nodejs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index d42e2995aba9..7ee2cde30be5 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -9,7 +9,7 @@ defaults: run: shell: bash env: - NODE_VERSION: 18.x + NODE_VERSION: 20.x jobs: build: runs-on: ${{matrix.os}} @@ -28,7 +28,7 @@ jobs: with: node-version: ${{ env.NODE_VERSION }} - name: Fix node-gyp and Python - run: python3 -m pip install packaging setuptools + run: pip install --break-system-packages packaging setuptools - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT From 17cac3e309e41287cdbfac8bb5f9de77784c7a93 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 18:15:12 +0200 Subject: [PATCH 2/7] add workflow dispatch trigger --- .github/workflows/nodejs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 7ee2cde30be5..b89514d6d75d 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -5,6 +5,7 @@ on: - master - canary pull_request: + workflow_dispatch: defaults: run: shell: bash From bd469f3347c2991ef6fc19921c98b1e6bdc92bb7 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 18:25:14 +0200 Subject: [PATCH 3/7] Only use break system install on macos --- .github/workflows/nodejs.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index b89514d6d75d..c29feb9447c8 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -29,7 +29,13 @@ jobs: with: node-version: ${{ env.NODE_VERSION }} - name: Fix node-gyp and Python - run: pip install --break-system-packages packaging setuptools + run: | + if [[ "$RUNNER_OS" == "macOS" ]]; then + EXTRA_ARGS="--break-system-packages" + else + EXTRA_ARGS="" + fi + python3 -m pip install $EXTRA_ARGS packaging setuptools - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT From 40f7fa52ffe3bd9a608a3c92a551e28b71bf6cfa Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 18:27:20 +0200 Subject: [PATCH 4/7] Try extra brew install --- .github/workflows/nodejs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index c29feb9447c8..6b8781f97d8b 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -32,6 +32,7 @@ jobs: run: | if [[ "$RUNNER_OS" == "macOS" ]]; then EXTRA_ARGS="--break-system-packages" + brew install python-setuptools python-packaging else EXTRA_ARGS="" fi From 5427c9107ac4cde681a1398599d1074e39890dc1 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 18:30:33 +0200 Subject: [PATCH 5/7] Brew install on mac, pip install on rest --- .github/workflows/nodejs.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 6b8781f97d8b..17e013fb91a0 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -31,12 +31,10 @@ jobs: - name: Fix node-gyp and Python run: | if [[ "$RUNNER_OS" == "macOS" ]]; then - EXTRA_ARGS="--break-system-packages" brew install python-setuptools python-packaging else - EXTRA_ARGS="" + python3 -m pip install $EXTRA_ARGS packaging setuptools fi - python3 -m pip install $EXTRA_ARGS packaging setuptools - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT From ecd4283ec410360d335cd024d87bdd43c33f9f27 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 19:03:21 +0200 Subject: [PATCH 6/7] Try using windows-2019 instead of latest (2022) --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 17e013fb91a0..ac5ba1e86c66 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -19,7 +19,7 @@ jobs: os: - macos-latest - ubuntu-latest - - windows-latest + - windows-2019 fail-fast: false steps: - name: Checkout From 766d6a6374bc5f052cb0a19760309317dd582247 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 24 Aug 2024 20:53:32 +0200 Subject: [PATCH 7/7] Back to original windows --- .github/workflows/nodejs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index ac5ba1e86c66..a5c7ba9ef8c9 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -10,7 +10,7 @@ defaults: run: shell: bash env: - NODE_VERSION: 20.x + NODE_VERSION: 18.x jobs: build: runs-on: ${{matrix.os}} @@ -19,7 +19,7 @@ jobs: os: - macos-latest - ubuntu-latest - - windows-2019 + - windows-latest fail-fast: false steps: - name: Checkout