Skip to content

Commit 487c30a

Browse files
author
xcodebuild
committed
Revert "build for Apple M1"
This reverts commit 681f2ad.
1 parent 681f2ad commit 487c30a

File tree

5 files changed

+51
-120
lines changed

5 files changed

+51
-120
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
strategy:
1010
matrix:
11-
os: [macos-latest, windows-latest, macos-10.15]
11+
os: [macos-latest, windows-latest]
1212

1313
steps:
1414
- name: Check out Git repository
@@ -20,13 +20,11 @@ jobs:
2020
node-version: 14
2121

2222
- name: Install deps
23-
if: matrix.os != 'macos-10.15'
2423
run: |
2524
npm run install-deps
2625
2726
- name: Build/release Electron app
2827
uses: samuelmeuli/action-electron-builder@v1
29-
if: matrix.os != 'macos-10.15'
3028
with:
3129
# GitHub token, automatically provided to the action
3230
# (No need to define this secret in the repo settings)
@@ -36,23 +34,3 @@ jobs:
3634
release: ${{ startsWith(github.ref, 'refs/tags/v') }}
3735
mac_certs: ${{ secrets.mac_certs }}
3836
mac_certs_password: ${{ secrets.mac_certs_password }}
39-
args: --x64
40-
41-
- name: Install deps for M1
42-
if: matrix.os == 'macos-10.15'
43-
run: |
44-
env IS_ARM=1 npm run install-deps
45-
46-
- name: Build/release Electron app for M1
47-
uses: samuelmeuli/action-electron-builder@v1
48-
if: matrix.os == 'macos-10.15'
49-
with:
50-
# GitHub token, automatically provided to the action
51-
# (No need to define this secret in the repo settings)
52-
github_token: ${{ secrets.github_token }}
53-
# If the commit is tagged with a version (e.g. "v1.0.0"),
54-
# release the app after building
55-
release: ${{ startsWith(github.ref, 'refs/tags/v') }}
56-
mac_certs: ${{ secrets.mac_certs }}
57-
mac_certs_password: ${{ secrets.mac_certs_password }}
58-
args: --arm64

‎.github/workflows/ci.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build:
1515
strategy:
1616
matrix:
17-
os: [windows-latest, macos-latest, macos-10.15]
17+
os: [windows-latest, macos-latest]
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- name: Check out Git repository
@@ -26,17 +26,10 @@ jobs:
2626
node-version: 14
2727

2828
- name: Install deps
29-
if: matrix.os != 'macos-10.15'
3029
run: |
3130
npm run install-deps
3231
npm run dateversion
3332
34-
- name: Install deps for M1
35-
if: matrix.os == 'macos-10.15'
36-
run: |
37-
env IS_ARM=1 npm run install-deps
38-
npm run dateversion
39-
4033
- name: build windows app
4134
if: matrix.os == 'windows-latest'
4235
run: |
@@ -51,13 +44,6 @@ jobs:
5144
env:
5245
GH_TOKEN: ${{ secrets.github_token }}
5346

54-
- name: build mac app for M1
55-
if: matrix.os == 'macos-10.15'
56-
run: |
57-
npm run dist:mac-arm
58-
env:
59-
GH_TOKEN: ${{ secrets.github_token }}
60-
6147
- name: upload windows app
6248
if: matrix.os == 'windows-latest'
6349
uses: actions/upload-artifact@v2
@@ -69,12 +55,5 @@ jobs:
6955
if: matrix.os == 'macos-latest'
7056
uses: actions/upload-artifact@v2
7157
with:
72-
name: iProxyTesting-Intel-${{ runner.OS }}
73-
path: release/*.dmg
74-
75-
- name: upload mac app for M1
76-
if: matrix.os == 'macos-10.15'
77-
uses: actions/upload-artifact@v2
78-
with:
79-
name: iProxyTesting-Apple-${{ runner.OS }}
58+
name: iProxyTesting-${{ runner.OS }}
8059
path: release/*.dmg

‎.github/workflows/nightly.yml

Lines changed: 45 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,48 @@ on:
66

77
jobs:
88
build:
9-
strategy:
10-
matrix:
11-
os: [windows-latest, macos-latest, macos-10.15]
12-
runs-on: ${{ matrix.os }}
13-
steps:
14-
- name: Check out Git repository
15-
uses: actions/checkout@v1
16-
17-
- name: Install Node.js, NPM and Yarn
18-
uses: actions/setup-node@v1
19-
with:
20-
node-version: 14
21-
22-
- name: Install deps
23-
if: matrix.os != 'macos-10.15'
24-
run: |
25-
npm run install-deps
26-
npm run nightlyversion
27-
28-
- name: Install deps for M1
29-
if: matrix.os == 'macos-10.15'
30-
run: |
31-
env IS_ARM=1 npm run install-deps
32-
npm run nightlyversion
33-
34-
- name: build windows app
35-
if: matrix.os == 'windows-latest'
36-
run: |
37-
npm run dist:win
38-
env:
39-
GH_TOKEN: ${{ secrets.github_token }}
40-
41-
- name: build mac app
42-
if: matrix.os == 'macos-latest'
43-
run: |
44-
npm run dist:mac
45-
env:
46-
GH_TOKEN: ${{ secrets.github_token }}
47-
48-
- name: build mac app for M1
49-
if: matrix.os == 'macos-10.15'
50-
run: |
51-
npm run dist:mac-arm
52-
env:
53-
GH_TOKEN: ${{ secrets.github_token }}
54-
55-
- name: upload windows app
56-
if: matrix.os == 'windows-latest'
57-
uses: actions/upload-artifact@v2
58-
with:
59-
name: iProxyNightly-${{ runner.OS }}
60-
path: release/*.exe
61-
62-
- name: upload mac app
63-
if: matrix.os == 'macos-latest'
64-
uses: actions/upload-artifact@v2
65-
with:
66-
name: iProxyNightly-Intel-${{ runner.OS }}
67-
path: release/*.dmg
68-
69-
- name: upload mac app for M1
70-
if: matrix.os == 'macos-10.15'
71-
uses: actions/upload-artifact@v2
72-
with:
73-
name: iProxyNightly-Apple-${{ runner.OS }}
74-
path: release/*.dmg
9+
strategy:
10+
matrix:
11+
os: [windows-latest, macos-latest]
12+
runs-on: ${{ matrix.os }}
13+
steps:
14+
- name: Check out Git repository
15+
uses: actions/checkout@v1
16+
17+
- name: Install Node.js, NPM and Yarn
18+
uses: actions/setup-node@v1
19+
with:
20+
node-version: 14
21+
22+
- name: Install deps
23+
run: |
24+
npm run install-deps
25+
npm run nightlyversion
26+
27+
- name: build windows app
28+
if: matrix.os == 'windows-latest'
29+
run: |
30+
npm run dist:win
31+
env:
32+
GH_TOKEN: ${{ secrets.github_token }}
33+
34+
- name: build mac app
35+
if: matrix.os == 'macos-latest'
36+
run: |
37+
npm run dist:mac
38+
env:
39+
GH_TOKEN: ${{ secrets.github_token }}
40+
41+
- name: upload windows app
42+
if: matrix.os == 'windows-latest'
43+
uses: actions/upload-artifact@v2
44+
with:
45+
name: iProxyNightly-${{ runner.OS }}
46+
path: release/*.exe
47+
48+
- name: upload mac app
49+
if: matrix.os == 'macos-latest'
50+
uses: actions/upload-artifact@v2
51+
with:
52+
name: iProxyNightly-${{ runner.OS }}
53+
path: release/*.dmg

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"compile": "yarn run lint && yarn run compile-main && yarn run compile-renderer",
1313
"build": "yarn clean:dist && yarn syncversion && yarn compile ",
1414
"dist": "yarn run build && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac --win --x64 --publish never",
15-
"dist:mac": "yarn run build && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac --x64",
16-
"dist:mac-arm": "yarn run build && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac --arm64",
15+
"dist:mac": "yarn run build && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac --universal",
1716
"dist:win": "yarn run build && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --win --x64",
1817
"dist-codesign": "yarn run build && electron-builder --mac --win --x64 --publish never",
1918
"pack": "yarn dist --dir -c.compression=store -c.mac.identity=null",

‎scripts/update-node.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ const shell = require('shelljs');
66
const systemType = os.type();
77
const SYSTEM_IS_MACOS = systemType === 'Darwin';
88

9-
const VERSION = 'v16.4.2';
10-
11-
const IS_ARM = process.env.IS_ARM === '1';
12-
139
if (SYSTEM_IS_MACOS) {
14-
shell.exec(`cd vendor/files/node && curl https://cdn.npm.taobao.org/dist/node/${VERSION}/node-${VERSION}-darwin-${IS_ARM ? 'arm64': 'x64'}.tar.gz| tar -xz && mv node-*-darwin-*/bin/node node-mac && rm -rf node-*-darwin-*`);
10+
shell.exec(`cd vendor/files/node && curl https://cdn.npm.taobao.org/dist/node/v15.12.0/node-v15.12.0-darwin-x64.tar.gz| tar -xz && mv node-*-darwin-x64/bin/node node-mac && rm -rf node-*-darwin-x64`);
1511
} else {
16-
shell.exec(`cd vendor/files/node && curl https://cdn.npm.taobao.org/dist/node/${VERSION}/win-x86/node.exe > node-win.exe`)
12+
shell.exec(`cd vendor/files/node && curl https://cdn.npm.taobao.org/dist/node/v14.15.3/win-x86/node.exe > node-win.exe`)
1713
}

0 commit comments

Comments
 (0)