From 3009d868ffe4512db49accf654055bd4883eedbd Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 3 Dec 2023 14:48:09 +0200 Subject: [PATCH 1/4] upgrade to node16 --- .devcontainer/devcontainer.json | 13 +++++-------- .github/workflows/ci.yml | 8 ++++---- .github/workflows/semantic-release.yml | 2 +- .node-version | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6874b5f8..b9784674 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,26 +5,23 @@ "build": { "dockerfile": "Dockerfile", // Update 'VARIANT' to pick a Node version: 10, 12, 14 - "args": { "VARIANT": "14" } + "args": { + "VARIANT": "16" + } }, - // Set *default* container specific settings.json values on container create. - "settings": { + "settings": { "terminal.integrated.shell.linux": "/bin/bash" }, - // Add the IDs of extensions you want installed when the container is created. "extensions": [ "dbaeumer.vscode-eslint", "octref.vetur" ], - // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], - // Use 'postCreateCommand' to run commands after the container is created. "postCreateCommand": "cat /gnome-keyring-fix.sh >> ~/.bashrc", - // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "node" -} +} \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d121f9d..59ef8271 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v3 with: - node-version: 14.x + node-version: 16.x cache: 'yarn' cache-dependency-path: 'yarn.lock' - run: yarn --network-timeout 100000 @@ -31,7 +31,7 @@ jobs: strategy: matrix: - node-version: [14.x] + node-version: [16.x] os: - windows-latest - ubuntu-latest @@ -81,7 +81,7 @@ jobs: - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: - node-version: 14.x + node-version: 16.x cache: 'yarn' cache-dependency-path: 'yarn.lock' - run: yarn --network-timeout 100000 diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 68248048..d7205958 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -49,7 +49,7 @@ jobs: - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: - node-version: 14.x + node-version: 16.x cache: 'yarn' cache-dependency-path: 'yarn.lock' - name: Install Snapcraft diff --git a/.node-version b/.node-version index 958b5a36..6f7f377b 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v14 +v16 From ad3c180c904e8332a29adcb0f0faf0b7a12f1f13 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 3 Dec 2023 15:02:52 +0200 Subject: [PATCH 2/4] Add Python package installation for node-gyp issue https://github.com/nodejs/node-gyp/issues/2869 --- .github/workflows/ci.yml | 6 ++++++ .github/workflows/semantic-release.yml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59ef8271..46052260 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 + - run: python3 -m pip install packaging - name: Use Node.js 16.x uses: actions/setup-node@v3 with: @@ -39,6 +41,8 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 + - run: python3 -m pip install packaging - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -78,6 +82,8 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 + - run: python3 -m pip install packaging - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index d7205958..b7f3e09d 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -23,6 +23,8 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 + - run: python3 -m pip install packaging - run: yarn --network-timeout 100000 - uses: cycjimmy/semantic-release-action@8f6ceb9d5aae5578b1dcda6af00008235204e7fa id: semantic @@ -46,6 +48,8 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 + - run: python3 -m pip install packaging - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: From d400f8dbc6fc28385234f11330eaafc980f0c89e Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 3 Dec 2023 15:15:48 +0200 Subject: [PATCH 3/4] Update Python version to 3.11 in CI workflow --- .github/workflows/ci.yml | 18 ++++++++++++------ .github/workflows/semantic-release.yml | 12 ++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46052260..065cb899 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - # https://github.com/nodejs/node-gyp/issues/2869 - - run: python3 -m pip install packaging + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' - name: Use Node.js 16.x uses: actions/setup-node@v3 with: @@ -41,8 +43,10 @@ jobs: steps: - uses: actions/checkout@v4 - # https://github.com/nodejs/node-gyp/issues/2869 - - run: python3 -m pip install packaging + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -82,8 +86,10 @@ jobs: steps: - uses: actions/checkout@v4 - # https://github.com/nodejs/node-gyp/issues/2869 - - run: python3 -m pip install packaging + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index b7f3e09d..89818218 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -23,8 +23,10 @@ jobs: steps: - uses: actions/checkout@v4 - # https://github.com/nodejs/node-gyp/issues/2869 - - run: python3 -m pip install packaging + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' - run: yarn --network-timeout 100000 - uses: cycjimmy/semantic-release-action@8f6ceb9d5aae5578b1dcda6af00008235204e7fa id: semantic @@ -48,8 +50,10 @@ jobs: steps: - uses: actions/checkout@v4 - # https://github.com/nodejs/node-gyp/issues/2869 - - run: python3 -m pip install packaging + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: From 0e75a754cee76b6f3935ed073d1502cc3f20a4c5 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 3 Dec 2023 15:51:19 +0200 Subject: [PATCH 4/4] comment --- .github/workflows/ci.yml | 3 +++ .github/workflows/semantic-release.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 065cb899..9c346215 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 - name: Use Python 3.11 uses: actions/setup-python@v4 with: @@ -43,6 +44,7 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 - name: Use Python 3.11 uses: actions/setup-python@v4 with: @@ -86,6 +88,7 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 - name: Use Python 3.11 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 89818218..3fba00da 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -23,6 +23,7 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 - name: Use Python 3.11 uses: actions/setup-python@v4 with: @@ -50,6 +51,7 @@ jobs: steps: - uses: actions/checkout@v4 + # https://github.com/nodejs/node-gyp/issues/2869 - name: Use Python 3.11 uses: actions/setup-python@v4 with: