From 46d798815b7401955ac4ef40953fa8fdbbf65a72 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 18 Oct 2023 15:47:59 +0200 Subject: [PATCH 1/4] nodejs-windows: python -m pip install packaging --- .github/workflows/nodejs-windows.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nodejs-windows.yml b/.github/workflows/nodejs-windows.yml index bfbfb9f1..a3704d0c 100644 --- a/.github/workflows/nodejs-windows.yml +++ b/.github/workflows/nodejs-windows.yml @@ -12,16 +12,18 @@ jobs: runs-on: windows-latest steps: - name: Clone gyp-next - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: gyp-next - name: Clone nodejs/node - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: nodejs/node path: node - name: Install deps - run: choco install nasm + run: | + python -m pip install packaging + choco install nasm - name: Replace gyp in Node.js run: | rm -Recurse node/tools/gyp From a7b518c3f851313d77b88974f256e0a6e4d4c129 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 18 Oct 2023 17:58:57 +0200 Subject: [PATCH 2/4] python -m pip install --upgrade packaging pip setuptools --- .github/workflows/node-gyp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node-gyp.yml b/.github/workflows/node-gyp.yml index edf68773..bc8ee63b 100644 --- a/.github/workflows/node-gyp.yml +++ b/.github/workflows/node-gyp.yml @@ -16,11 +16,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Clone gyp-next - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: gyp-next - name: Clone nodejs/node-gyp - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: nodejs/node-gyp path: node-gyp @@ -34,7 +34,7 @@ jobs: - name: Install Python dependencies run: | cd gyp-next - python -m pip install --upgrade pip setuptools + python -m pip install --upgrade packaging pip setuptools pip install --editable . pip uninstall -y gyp-next - name: Install Node.js dependencies From 9e9e13473a0c2b6a4cd741094b0fe96fc86203d8 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 18 Oct 2023 18:00:05 +0200 Subject: [PATCH 3/4] Upgrade to GitHub Actions checkout@v4 --- .github/workflows/python_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index 87e74d73..049d5fe5 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -18,7 +18,7 @@ jobs: os: [macos-latest, ubuntu-latest] # , windows-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: From daf193e3096aafa13d8c646de18d7d5118a15081 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 18 Oct 2023 18:01:36 +0200 Subject: [PATCH 4/4] Update nodejs-windows.yml --- .github/workflows/nodejs-windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/nodejs-windows.yml b/.github/workflows/nodejs-windows.yml index a3704d0c..3f52ff9c 100644 --- a/.github/workflows/nodejs-windows.yml +++ b/.github/workflows/nodejs-windows.yml @@ -21,9 +21,7 @@ jobs: repository: nodejs/node path: node - name: Install deps - run: | - python -m pip install packaging - choco install nasm + run: choco install nasm - name: Replace gyp in Node.js run: | rm -Recurse node/tools/gyp