ci: fixes conflicting Node.js distribution on MacOS 14

siouan · Jun 8, 2024 · e9b3d90 · e9b3d90
1 parent f4e937d
commit e9b3d90
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,4 +5,3 @@ ECHO %~dp0 %*
 ) ELSE (
     node %*
 )
-