From 0e9b8c213f87e4757278b2ca71e53ae3454ccb43 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 29 Aug 2024 10:33:22 +0200 Subject: [PATCH 1/3] GitHub Actions" Add Node.js v22 and use runner.os --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 315b45ab..87577fe7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [18.x, 20.x] + node-version: [18.x, 20.x, 22.x] os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 @@ -21,13 +21,13 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - - if: startsWith(matrix.os, 'ubuntu') + - if: runner.os == 'Linux' run: sudo apt-get install -y build-essential libgl1-mesa-dri libglapi-mesa libglew-dev libglu1-mesa-dev libosmesa6 libxi-dev mesa-utils pkg-config - run: npm ci - run: npm run build --if-present - - if: startsWith(matrix.os, 'ubuntu') + - if: runner.os == 'Linux' run: xvfb-run npm test - - if: "!startsWith(matrix.os, 'ubuntu')" + - if: runner.os != 'Linux' run: npm test From 3174bfb1cf59fe0ea904d29ba25db80b15e9ca8e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 29 Aug 2024 10:45:34 +0200 Subject: [PATCH 2/3] package.json: dependencies "node-gyp": "^10.2.0", --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6158fbef..cfb00397 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "glsl-tokenizer": "^2.1.5", "nan": "^2.18.0", "node-abi": "^3.56.0", - "node-gyp": "^10.0.1", + "node-gyp": "^10.2.0", "prebuild-install": "^7.1.1" }, "devDependencies": { From 7310904e5d8c9136bbbc2c440992b3db6ceaf3ee Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 29 Aug 2024 10:49:31 +0200 Subject: [PATCH 3/3] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87577fe7..e91ade72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,8 @@ jobs: run: sudo apt-get install -y build-essential libgl1-mesa-dri libglapi-mesa libglew-dev libglu1-mesa-dev libosmesa6 libxi-dev mesa-utils pkg-config - - run: npm ci + - run: rm package-lock.json + - run: npm install - run: npm run build --if-present - if: runner.os == 'Linux' run: xvfb-run npm test