Skip to content

Commit

Permalink
Merge pull request #413 from ZIMkaRU/feature/update-macos-on-gh-actions
Browse files Browse the repository at this point in the history
Update macOS on GH Actions
  • Loading branch information
ezewer authored Oct 4, 2024
2 parents 4d11633 + 5d1e030 commit 4d6ba0b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-electron-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
mac-builder:
timeout-minutes: 150
runs-on: macos-12
runs-on: macos-15
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
mac-e2e-test-runner:
name: Mac E2E Test Runner
timeout-minutes: 30
runs-on: macos-12
runs-on: macos-15
needs: [mac-builder]
steps:
- name: Checkout
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"clean-stack": "3.0.1",
"compare-versions": "4.1.1",
"cron-validate": "1.4.3",
"ed25519-supercop": "2.0.1",
"electron-alert": "0.1.20",
"electron-log": "4.4.8",
"electron-root-path": "1.0.16",
Expand Down
1 change: 0 additions & 1 deletion scripts/helpers/install-backend-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ function installBackendDeps {

echo -e "\n${COLOR_BLUE}Installing the main prod deps...${COLOR_NORMAL}"
npm i --production --include=dev --no-audit --progress=false --force
rm -rf "$ROOT/node_modules/ed25519-supercop/build"
checkNodeModulesDir "$ROOT"
depsErr=$(npm ls --depth=0 --only=prod 2>&1 >/dev/null | grep -E -v "missing: eslint|--omit=dev" || [[ $? == 1 ]])
if [ -n "$depsErr" ]; then
Expand Down

0 comments on commit 4d6ba0b

Please sign in to comment.