npm-scripts.mjs: remove old msys stuff

- Plus cosmetic changes in CI files
versatica · Nov 25, 2023 · 90b8e33 · 90b8e33
1 parent e2e6304
commit 90b8e33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/mediasoup-worker-prebuild.yaml b/.github/workflows/mediasoup-worker-prebuild.yaml
@@ -54,10 +54,10 @@ jobs:
       - name: npm ci
         run: npm ci --ignore-scripts --omit=dev
 
-      # However we also need to install pip invoke by manually invoking the NPM
-      # 'preinstall' script (since `--ignore-scripts` above made it not run).
-      - name: npm run preinstall
-        run: npm run preinstall
+      # However we also need to install pip invoke manually (since
+      # `--ignore-scripts` prevented invoke from being installed).
+      - name: pip3 install invoke
+        run: pip3 install invoke
 
       - name: npm run worker:build
         run: npm run worker:build

diff --git a/.github/workflows/mediasoup-worker.yaml b/.github/workflows/mediasoup-worker.yaml
@@ -68,10 +68,10 @@ jobs:
       - name: npm ci
         run: npm ci --ignore-scripts --omit=dev
 
-      # However we also need to install pip invoke by manually invoking the NPM
-      # 'preinstall' script (since `--ignore-scripts` above made it not run).
-      - name: npm run preinstall
-        run: npm run preinstall
+      # However we also need to install pip invoke manually (since
+      # `--ignore-scripts` prevented invoke from being installed).
+      - name: pip3 install invoke
+        run: pip3 install invoke
 
       # We need to install deps on worker/scripts/package.json.
       - name: npm run install-worker-dev-tools

diff --git a/npm-scripts.mjs b/npm-scripts.mjs
@@ -379,14 +379,6 @@ function cleanWorkerArtifacts()
 	executeCmd(`${PYTHON} -m invoke -r worker clean-subprojects`);
 	// Clean PIP/Meson/Ninja.
 	executeCmd(`${PYTHON} -m invoke -r worker clean-pip`);
-
-	if (IS_WINDOWS)
-	{
-		if (fs.existsSync('worker/out/msys'))
-		{
-			executeCmd('rd /s /q worker\\out\\msys');
-		}
-	}
 }
 
 function lintNode()