Skip to content

Commit b242b98

Browse files
committed
fix: use free GitHub runners with cross-compilation
1 parent ce84db1 commit b242b98

File tree

1 file changed

+14
-88
lines changed

1 file changed

+14
-88
lines changed

.github/workflows/release.yml

Lines changed: 14 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -37,38 +37,7 @@ jobs:
3737
path: release/*
3838
if-no-files-found: error
3939

40-
build-macos-x64:
41-
runs-on: macos-15-large
42-
steps:
43-
- uses: actions/checkout@v4
44-
45-
- name: Setup Node.js
46-
uses: actions/setup-node@v4
47-
with:
48-
node-version: '22'
49-
cache: 'npm'
50-
51-
- name: Install dependencies
52-
run: npm ci
53-
env:
54-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55-
56-
- name: Build and Package for x64
57-
run: npm run build && npx electron-builder --mac --x64
58-
env:
59-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60-
61-
- name: List release files
62-
run: ls -la release/
63-
64-
- name: Upload artifacts
65-
uses: actions/upload-artifact@v4
66-
with:
67-
name: macos-x64-builds
68-
path: release/*
69-
if-no-files-found: error
70-
71-
build-macos-arm64:
40+
build-macos:
7241
runs-on: macos-latest
7342
steps:
7443
- uses: actions/checkout@v4
@@ -84,8 +53,8 @@ jobs:
8453
env:
8554
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8655

87-
- name: Build and Package for arm64
88-
run: npm run build && npx electron-builder --mac --arm64
56+
- name: Build and Package
57+
run: npm run dist
8958
env:
9059
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9160

@@ -95,11 +64,11 @@ jobs:
9564
- name: Upload artifacts
9665
uses: actions/upload-artifact@v4
9766
with:
98-
name: macos-arm64-builds
67+
name: macos-builds
9968
path: release/*
10069
if-no-files-found: error
10170

102-
build-linux-x64:
71+
build-linux:
10372
runs-on: ubuntu-latest
10473
steps:
10574
- uses: actions/checkout@v4
@@ -115,39 +84,8 @@ jobs:
11584
env:
11685
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11786

118-
- name: Build and Package for x64
119-
run: npm run build && npx electron-builder --linux --x64
120-
env:
121-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122-
123-
- name: List release files
124-
run: ls -la release/
125-
126-
- name: Upload artifacts
127-
uses: actions/upload-artifact@v4
128-
with:
129-
name: linux-x64-builds
130-
path: release/*
131-
if-no-files-found: error
132-
133-
build-linux-arm64:
134-
runs-on: ubuntu-24.04-arm
135-
steps:
136-
- uses: actions/checkout@v4
137-
138-
- name: Setup Node.js
139-
uses: actions/setup-node@v4
140-
with:
141-
node-version: '22'
142-
cache: 'npm'
143-
144-
- name: Install dependencies
145-
run: npm ci
146-
env:
147-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
148-
149-
- name: Build and Package for arm64
150-
run: npm run build && npx electron-builder --linux --arm64
87+
- name: Build and Package
88+
run: npm run dist
15189
env:
15290
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15391

@@ -157,12 +95,12 @@ jobs:
15795
- name: Upload artifacts
15896
uses: actions/upload-artifact@v4
15997
with:
160-
name: linux-arm64-builds
98+
name: linux-builds
16199
path: release/*
162100
if-no-files-found: error
163101

164102
release:
165-
needs: [build-windows, build-macos-x64, build-macos-arm64, build-linux-x64, build-linux-arm64]
103+
needs: [build-windows, build-macos, build-linux]
166104
runs-on: ubuntu-latest
167105
permissions:
168106
contents: write
@@ -175,28 +113,16 @@ jobs:
175113
name: windows-builds
176114
path: release-files
177115

178-
- name: Download macOS x64 artifacts
179-
uses: actions/download-artifact@v4
180-
with:
181-
name: macos-x64-builds
182-
path: release-files
183-
184-
- name: Download macOS arm64 artifacts
185-
uses: actions/download-artifact@v4
186-
with:
187-
name: macos-arm64-builds
188-
path: release-files
189-
190-
- name: Download Linux x64 artifacts
116+
- name: Download macOS artifacts
191117
uses: actions/download-artifact@v4
192118
with:
193-
name: linux-x64-builds
119+
name: macos-builds
194120
path: release-files
195121

196-
- name: Download Linux arm64 artifacts
122+
- name: Download Linux artifacts
197123
uses: actions/download-artifact@v4
198124
with:
199-
name: linux-arm64-builds
125+
name: linux-builds
200126
path: release-files
201127

202128
- name: List all release files
@@ -231,7 +157,7 @@ jobs:
231157
- **macOS**: 下载对应架构的 .dmg 拖入 Applications。如提示"已损坏",请在终端执行:`xattr -cr /Applications/Adnify.app`
232158
- **Linux**: 下载对应架构的 .AppImage,`chmod +x` 后运行
233159
234-
> 💡 不确定架构?Windows/macOS 大多数电脑选 x64,M1/M2/M3 Mac 选 arm64
160+
> 💡 不确定架构?Windows 大多数电脑选 x64,M1/M2/M3 Mac 选 arm64,Intel Mac 选 x64
235161
236162
---
237163
📦 [Gitee 镜像](https://gitee.com/adnaan/adnify/releases/tag/v${{ steps.version.outputs.VERSION }})

0 commit comments

Comments
 (0)