Skip to content

Commit 9058458

Browse files
committed
fix: build deps prior to pkg
1 parent bd6b80a commit 9058458

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
5454
CODESIGNING_IDENTITY: ${{ secrets.CODESIGNING_IDENTITY }}
5555
run: |
56-
# Build both DMG and ZIP with single make command
56+
# Now make the distributables
5757
pnpm make:${{ matrix.arch }}
5858
5959
- name: Get version from package.json

apps/desktop/package.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,28 @@
99
"url": "https://github.com/amicalhq/amical"
1010
},
1111
"scripts": {
12-
"start": "pnpm build:swift-helper && electron-forge start",
12+
"start": "pnpm build:deps && electron-forge start",
1313
"start:onboarding": "FORCE_ONBOARDING=true pnpm start",
14-
"package": "pnpm build:swift-helper && electron-forge package",
15-
"make": "pnpm build:swift-helper && electron-forge make --platform=darwin --arch=x64,arm64",
16-
"make:arm64": "pnpm build:swift-helper && electron-forge make --platform=darwin --arch=arm64",
17-
"make:x64": "pnpm build:swift-helper && electron-forge make --platform=darwin --arch=x64",
18-
"make:dmg": "pnpm build:swift-helper && electron-forge make --targets=@electron-forge/maker-dmg --platform=darwin --arch=arm64,x64",
19-
"make:dmg:arm64": "pnpm build:swift-helper && electron-forge make --targets=@electron-forge/maker-dmg --platform=darwin --arch=arm64",
20-
"make:dmg:x64": "pnpm build:swift-helper && electron-forge make --targets=@electron-forge/maker-dmg --platform=darwin --arch=x64",
21-
"make:zip:arm64": "pnpm build:swift-helper && electron-forge make --targets=@electron-forge/maker-zip --platform=darwin --arch=arm64",
22-
"make:zip:x64": "pnpm build:swift-helper && electron-forge make --targets=@electron-forge/maker-zip --platform=darwin --arch=x64",
23-
"package:arm64": "pnpm build:swift-helper && electron-forge package --platform=darwin --arch=arm64",
24-
"package:x64": "pnpm build:swift-helper && electron-forge package --platform=darwin --arch=x64",
14+
"package": "pnpm build:deps && electron-forge package",
15+
"make": "pnpm build:deps && electron-forge make --platform=darwin --arch=x64,arm64",
16+
"make:arm64": "pnpm build:deps && electron-forge make --platform=darwin --arch=arm64",
17+
"make:x64": "pnpm build:deps && electron-forge make --platform=darwin --arch=x64",
18+
"make:dmg": "pnpm build:deps && electron-forge make --targets=@electron-forge/maker-dmg --platform=darwin --arch=arm64,x64",
19+
"make:dmg:arm64": "pnpm build:deps && electron-forge make --targets=@electron-forge/maker-dmg --platform=darwin --arch=arm64",
20+
"make:dmg:x64": "pnpm build:deps && electron-forge make --targets=@electron-forge/maker-dmg --platform=darwin --arch=x64",
21+
"make:zip:arm64": "pnpm build:deps && electron-forge make --targets=@electron-forge/maker-zip --platform=darwin --arch=arm64",
22+
"make:zip:x64": "pnpm build:deps && electron-forge make --targets=@electron-forge/maker-zip --platform=darwin --arch=x64",
23+
"package:arm64": "pnpm build:deps && electron-forge package --platform=darwin --arch=arm64",
24+
"package:x64": "pnpm build:deps && electron-forge package --platform=darwin --arch=x64",
2525
"publish": "electron-forge publish",
2626
"lint": "eslint --ext .ts,.tsx .",
2727
"format:check": "prettier --check \"**/*.{ts,tsx,md,json,mjs,mts,css,mdx}\" --cache --ignore-path=../../.prettierignore",
2828
"ts:check": "tsc --noEmit",
2929
"db:generate": "drizzle-kit generate",
3030
"db:push": "drizzle-kit push",
3131
"db:migrate": "drizzle-kit migrate",
32+
"build:deps": "pnpm build:types && pnpm build:swift-helper",
33+
"build:types": "pnpm --filter @amical/types build",
3234
"build:swift-helper": "pnpm --filter @amical/swift-helper build",
3335
"dev": "pnpm start",
3436
"download-node": "tsx scripts/download-node-binaries.ts",

0 commit comments

Comments
 (0)