From e9b3d905e30341f25f79b44cc2d9ef2b92eaf83e Mon Sep 17 00:00:00 2001 From: v1nc3n4 <5869062+v1nc3n4@users.noreply.github.com> Date: Sat, 8 Jun 2024 23:51:19 +0200 Subject: [PATCH] ci: fixes conflicting Node.js distribution on MacOS 14 --- .github/workflows/build.yml | 5 +++-- .../intTest/resources/node-dist-without-node/bin/corepack | 1 - plugin/src/intTest/resources/node-dist-without-node/bin/npm | 1 - plugin/src/intTest/resources/node-dist-without-node/bin/npx | 1 - plugin/src/intTest/resources/node-dist-without-node/bin/pnpm | 1 - plugin/src/intTest/resources/node-dist-without-node/bin/pnpx | 1 - plugin/src/intTest/resources/node-dist-without-node/bin/yarn | 1 - .../intTest/resources/node-dist-without-node/corepack.cmd | 1 - plugin/src/intTest/resources/node-dist-without-node/npm.cmd | 1 - plugin/src/intTest/resources/node-dist-without-node/npx.cmd | 1 - plugin/src/intTest/resources/node-dist-without-node/pnpm.cmd | 1 - plugin/src/intTest/resources/node-dist-without-node/pnpx.cmd | 1 - plugin/src/intTest/resources/node-dist-without-node/yarn.cmd | 1 - 13 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d9bf7c0..be1560c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, macos-14, windows-2022] +# os: [ubuntu-22.04, macos-14, windows-2022] + os: [macos-14] steps: - name: Init Ubuntu environment @@ -22,7 +23,7 @@ jobs: - name: Init MacOS environment if: matrix.os == 'macos-14' - run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/bin/yarn /Users/runner/.yarn/bin/yarn + run: sudo rm -f /opt/homebrew/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/bin/yarn /Users/runner/.yarn/bin/yarn - name: Init Windows environment if: matrix.os == 'windows-2022' diff --git a/plugin/src/intTest/resources/node-dist-without-node/bin/corepack b/plugin/src/intTest/resources/node-dist-without-node/bin/corepack index 41de4b4e..908ba841 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/bin/corepack +++ b/plugin/src/intTest/resources/node-dist-without-node/bin/corepack @@ -1,2 +1 @@ #!/usr/bin/env node - diff --git a/plugin/src/intTest/resources/node-dist-without-node/bin/npm b/plugin/src/intTest/resources/node-dist-without-node/bin/npm index 41de4b4e..908ba841 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/bin/npm +++ b/plugin/src/intTest/resources/node-dist-without-node/bin/npm @@ -1,2 +1 @@ #!/usr/bin/env node - diff --git a/plugin/src/intTest/resources/node-dist-without-node/bin/npx b/plugin/src/intTest/resources/node-dist-without-node/bin/npx index 41de4b4e..908ba841 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/bin/npx +++ b/plugin/src/intTest/resources/node-dist-without-node/bin/npx @@ -1,2 +1 @@ #!/usr/bin/env node - diff --git a/plugin/src/intTest/resources/node-dist-without-node/bin/pnpm b/plugin/src/intTest/resources/node-dist-without-node/bin/pnpm index 41de4b4e..908ba841 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/bin/pnpm +++ b/plugin/src/intTest/resources/node-dist-without-node/bin/pnpm @@ -1,2 +1 @@ #!/usr/bin/env node - diff --git a/plugin/src/intTest/resources/node-dist-without-node/bin/pnpx b/plugin/src/intTest/resources/node-dist-without-node/bin/pnpx index 41de4b4e..908ba841 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/bin/pnpx +++ b/plugin/src/intTest/resources/node-dist-without-node/bin/pnpx @@ -1,2 +1 @@ #!/usr/bin/env node - diff --git a/plugin/src/intTest/resources/node-dist-without-node/bin/yarn b/plugin/src/intTest/resources/node-dist-without-node/bin/yarn index 41de4b4e..908ba841 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/bin/yarn +++ b/plugin/src/intTest/resources/node-dist-without-node/bin/yarn @@ -1,2 +1 @@ #!/usr/bin/env node - diff --git a/plugin/src/intTest/resources/node-dist-without-node/corepack.cmd b/plugin/src/intTest/resources/node-dist-without-node/corepack.cmd index 1c835f1b..2c540e6c 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/corepack.cmd +++ b/plugin/src/intTest/resources/node-dist-without-node/corepack.cmd @@ -5,4 +5,3 @@ ECHO %~dp0 %* ) ELSE ( node %* ) - diff --git a/plugin/src/intTest/resources/node-dist-without-node/npm.cmd b/plugin/src/intTest/resources/node-dist-without-node/npm.cmd index 1c835f1b..2c540e6c 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/npm.cmd +++ b/plugin/src/intTest/resources/node-dist-without-node/npm.cmd @@ -5,4 +5,3 @@ ECHO %~dp0 %* ) ELSE ( node %* ) - diff --git a/plugin/src/intTest/resources/node-dist-without-node/npx.cmd b/plugin/src/intTest/resources/node-dist-without-node/npx.cmd index 1c835f1b..2c540e6c 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/npx.cmd +++ b/plugin/src/intTest/resources/node-dist-without-node/npx.cmd @@ -5,4 +5,3 @@ ECHO %~dp0 %* ) ELSE ( node %* ) - diff --git a/plugin/src/intTest/resources/node-dist-without-node/pnpm.cmd b/plugin/src/intTest/resources/node-dist-without-node/pnpm.cmd index 1c835f1b..2c540e6c 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/pnpm.cmd +++ b/plugin/src/intTest/resources/node-dist-without-node/pnpm.cmd @@ -5,4 +5,3 @@ ECHO %~dp0 %* ) ELSE ( node %* ) - diff --git a/plugin/src/intTest/resources/node-dist-without-node/pnpx.cmd b/plugin/src/intTest/resources/node-dist-without-node/pnpx.cmd index 1c835f1b..2c540e6c 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/pnpx.cmd +++ b/plugin/src/intTest/resources/node-dist-without-node/pnpx.cmd @@ -5,4 +5,3 @@ ECHO %~dp0 %* ) ELSE ( node %* ) - diff --git a/plugin/src/intTest/resources/node-dist-without-node/yarn.cmd b/plugin/src/intTest/resources/node-dist-without-node/yarn.cmd index 1c835f1b..2c540e6c 100644 --- a/plugin/src/intTest/resources/node-dist-without-node/yarn.cmd +++ b/plugin/src/intTest/resources/node-dist-without-node/yarn.cmd @@ -5,4 +5,3 @@ ECHO %~dp0 %* ) ELSE ( node %* ) -