From 95e6472acaec13c878fea2e1f6e733c2b7a92551 Mon Sep 17 00:00:00 2001 From: Remco Haszing Date: Thu, 18 Apr 2024 10:06:06 +0200 Subject: [PATCH 1/2] Update GitHub actions to the latest version This includes the update of the Node.js version used. The action `GabrielBB/xvfb-action` is deprecated and is no longer needed. --- .github/workflows/main.yml | 19 ++++++++----------- .github/workflows/publish.yml | 6 +++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ccc60e..d471c0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,26 +9,23 @@ jobs: os: [macos-latest, ubuntu-latest, windows-latest] runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - run: npm install - - name: test - uses: GabrielBB/xvfb-action@v1.6 - with: - run: npm test + - run: xvfb-run npm test package: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - run: npm install - run: npx vsce package - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: vscode-remark.vsix path: '*.vsix' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 52f2701..b4f6785 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,10 +8,10 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - run: npm install - run: npx vsce package - run: npx vsce publish --packagePath *.vsix From 8c88be082e02e4b5e456901c78c81fd971987914 Mon Sep 17 00:00:00 2001 From: Remco Haszing Date: Thu, 18 Apr 2024 10:20:53 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20use=20xvfb-run=20in=20Windo?= =?UTF-8?q?ws=20or=20macOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d471c0e..03917c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,10 @@ jobs: with: node-version: 20 - run: npm install + - run: npm test + if: ${{matrix.os!='ubuntu-latest'}} - run: xvfb-run npm test + if: ${{matrix.os=='ubuntu-latest'}} package: runs-on: ubuntu-latest