Fix GitHub actions build for macOS

stomp-js · Jan 8, 2025 · 3314fc2 · 3314fc2
1 parent 3e0adc2
commit 3314fc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow that is manually triggered
 
-name: Safari, Edge
+name: Safari
 
 # Controls when the action will run. Workflow runs when manually triggered using the UI
 # or API.
@@ -22,4 +22,3 @@ jobs:
       - run: npm ci
       - run: npm run build
       - run: npx karma start spec/karma.conf.js --single-run --browsers=Safari
-      - run: npx karma start spec/karma.conf.js --single-run --browsers=EdgeHeadless
diff --git a/bin/osx/setup-rabbit.sh b/bin/osx/setup-rabbit.sh
@@ -4,8 +4,9 @@ set -ex
 
 brew install rabbitmq
 
-/usr/local/sbin/rabbitmq-plugins enable --offline rabbitmq_web_stomp
-echo 'web_stomp.ws_frame = binary' >> /usr/local/etc/rabbitmq/rabbitmq.conf
+# Path depends on whether Apple or Intel silicon is in use, https://www.rabbitmq.com/docs/install-homebrew
+/opt/homebrew/sbin/rabbitmq-plugins enable --offline rabbitmq_web_stomp
+echo 'web_stomp.ws_frame = binary' >>/opt/homebrew/etc/rabbitmq/rabbitmq.conf
 
 brew services run rabbitmq
 brew services list