Revert "maybe more progress"

This reverts commit b1edca3.

Author: shouples

.semaphore/semaphore.yml

@@ -25,21 +25,10 @@ global_job_config:
       - checkout
       - make ci-bin-sem-cache-restore
       - |
-        if [ "$(uname -s)" = "Linux" ] || [ "$(uname -s)" = "Darwin" ]; then
-          if [[ "${SEMAPHORE_ORGANIZATION_URL}" == *".semaphoreci.com" ]]; then
-            echo "Skipping Vault setup for Semaphore CI"
-          else
-            . vault-setup
-          fi
-        elif [ "$(uname -s)" = "MINGW64_NT-10.0" ]; then
-          if ($env:SEMAPHORE_ORGANIZATION_URL -like "*.semaphoreci.com") {
-            Write-Output "Skipping Vault setup for Semaphore CI"
-          } else {
-            .\vault-setup.ps1
-          }
+        if [[ "${SEMAPHORE_ORGANIZATION_URL}" == *".semaphoreci.com" ]]; then
+          echo "Skipping Vault setup for Semaphore CI"
         else
-          echo "Unsupported OS"
-          exit 1
+          . vault-setup
         fi
   epilogue:
     always:

Makefile

@@ -9,23 +9,6 @@ install-dependencies:
 	npm ci --prefer-offline --include=dev
 	npx playwright install
 
-# Install additional test dependencies to run VSCode testing in headless mode (on Linux)
-# ref: https://code.visualstudio.com/api/working-with-extensions/continuous-integration#github-actions
-.PHONY: install-test-dependencies
-install-test-dependencies:
-	@echo "Installing test dependencies for $(shell uname -s)"
-	@if [ $$(uname -s) = "Linux" ]; then \
-			sudo apt-get update; \
-			sudo apt install -y libgbm1 libgtk-3-0 xvfb; \
-	elif [ $$(uname -s) = "Darwin" ]; then \
-			sudo brew update; \
-			sudo brew install gtk+3; \
-			sudo brew install --cask xquartz; \
-	else \
-			echo "Unsupported OS for headless testing"; \
-			exit 1; \
-	fi
-
 .PHONY: setup-test-env
 setup-test-env:
 	@echo "Pulling automated-test-user credentials from Vault into .env file for testing"
@@ -37,8 +20,22 @@ remove-test-env:
 	@echo "Removing .env file"
 	@rm -f .env
 
+# Install additional test dependencies to run VSCode testing in headless mode (on Linux)
+# ref: https://code.visualstudio.com/api/working-with-extensions/continuous-integration#github-actions
 .PHONY: test
-test: setup-test-env install-test-dependencies install-dependencies
+test: setup-test-env install-dependencies
+	@echo "Installing test dependencies for $(shell uname -s)"
+	@if [ $$(uname -s) = "Linux" ]; then \
+			sudo apt-get update; \
+			sudo apt install -y libgbm1 libgtk-3-0 xvfb; \
+	elif [ $$(uname -s) = "Darwin" ]; then \
+			brew update; \
+			brew install gtk+3; \
+			brew install --cask xquartz; \
+	else \
+			echo "Unsupported OS for headless testing"; \
+			exit 1; \
+	fi
 	npx gulp ci
 	@if [ $$(uname -s) = "Linux" ]; then \
 			xvfb-run -a npx gulp test; \