Skip to content

Commit 88bceee

Browse files
rkistnerrkistner
committed
Upgrade target platforms.
1 parent 5323e0d commit 88bceee

3 files changed

Lines changed: 77 additions & 51 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,57 +81,84 @@ aliases:
8181

8282
version: 2
8383
jobs:
84+
build-12.6.0:
85+
<<: *common-build
86+
docker:
87+
- image: circleci/node:12.6.0
88+
8489
build-10.16.0:
8590
<<: *common-build
8691
docker:
8792
- image: circleci/node:10.16.0
8893

89-
90-
build-8.15.1:
94+
build-8.16.0:
9195
<<: *common-build
9296
docker:
93-
- image: circleci/node:8.15.1
94-
97+
- image: circleci/node:8.16.0
9598

9699
build-electron-5.0.6:
97100
<<: *common-electron-linux
98101
environment:
99102
PRE_GYP_ARGS: --runtime=electron --target=5.0.6 --disturl=https://atom.io/download/electron
100103

101-
build-electron-2.0.4:
104+
build-electron-4.2.6:
102105
<<: *common-electron-linux
103106
environment:
104-
PRE_GYP_ARGS: --runtime=electron --target=2.0.4 --disturl=https://atom.io/download/electron
107+
PRE_GYP_ARGS: --runtime=electron --target=4.2.6 --disturl=https://atom.io/download/electron
105108

106-
build-electron-1.8.6:
109+
build-electron-3.1.11:
107110
<<: *common-electron-linux
108111
environment:
109-
PRE_GYP_ARGS: --runtime=electron --target=1.8.6 --disturl=https://atom.io/download/electron
112+
PRE_GYP_ARGS: --runtime=electron --target=3.1.11 --disturl=https://atom.io/download/electron
110113

111-
build-electron-1.7.11:
114+
build-electron-2.0.18:
112115
<<: *common-electron-linux
113116
environment:
114-
PRE_GYP_ARGS: --runtime=electron --target=1.7.9 --disturl=https://atom.io/download/electron
117+
PRE_GYP_ARGS: --runtime=electron --target=2.0.18 --disturl=https://atom.io/download/electron
115118

116-
117-
build-macos-10.16.0:
119+
build-macos-12.6.0:
118120
<<: *common-macos
119121
environment:
120122
NODE_VERSION: "12.6.0"
121123

124+
build-macos-10.16.0:
125+
<<: *common-macos
126+
environment:
127+
NODE_VERSION: "10.16.0"
122128

123129
build-macos-electron-5.0.6:
124130
<<: *common-macos
125131
environment:
126132
PRE_GYP_ARGS: --runtime=electron --target=5.0.6 --disturl=https://atom.io/download/electron
127-
NODE_VERSION: "12.6.0"
133+
NODE_VERSION: "10.16.0"
134+
135+
build-macos-electron-4.2.6:
136+
<<: *common-macos
137+
environment:
138+
PRE_GYP_ARGS: --runtime=electron --target=4.2.6 --disturl=https://atom.io/download/electron
139+
NODE_VERSION: "10.16.0"
140+
141+
build-macos-electron-3.1.11:
142+
<<: *common-macos
143+
environment:
144+
PRE_GYP_ARGS: --runtime=electron --target=3.1.11 --disturl=https://atom.io/download/electron
145+
NODE_VERSION: "10.16.0"
128146

129147
workflows:
130148
version: 2
131149
build_all:
132150
jobs:
151+
- build-12.6.0
133152
- build-10.16.0
134-
- build-8.15.1
153+
- build-8.16.0
154+
- build-electron-5.0.6
155+
- build-electron-4.2.6
156+
- build-electron-3.1.11
157+
- build-electron-2.0.18
135158
- build-electron-5.0.6
159+
- build-macos-12.6.0
136160
- build-macos-10.16.0
161+
- build-macos-8.16.0
137162
- build-macos-electron-5.0.6
163+
- build-macos-electron-4.2.6
164+
- build-macos-electron-3.1.11

‎appveyor.yml‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,47 @@ environment:
22
matrix:
33
- nodejs_version: 8
44
platform: x64
5-
msvs_toolset: 14
65
- nodejs_version: 8
76
platform: x86
8-
msvs_toolset: 14
97
- nodejs_version: 10
108
platform: x64
11-
msvs_toolset: 14
129
- nodejs_version: 10
1310
platform: x86
14-
msvs_toolset: 14
11+
- nodejs_version: 12
12+
platform: x64
13+
- nodejs_version: 12
14+
platform: x86
15+
# electron
16+
- nodejs_version: 10
17+
platform: x64
18+
NODE_RUNTIME: electron
19+
NODE_RUNTIME_VERSION: 5.0.6
20+
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
21+
- nodejs_version: 10
22+
platform: x86
23+
NODE_RUNTIME: electron
24+
NODE_RUNTIME_VERSION: 5.0.6
25+
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
26+
- nodejs_version: 10
27+
platform: x64
28+
NODE_RUNTIME: electron
29+
NODE_RUNTIME_VERSION: 4.2.6
30+
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
31+
- nodejs_version: 10
32+
platform: x86
33+
NODE_RUNTIME: electron
34+
NODE_RUNTIME_VERSION: 4.2.6
35+
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
36+
- nodejs_version: 10
37+
platform: x64
38+
NODE_RUNTIME: electron
39+
NODE_RUNTIME_VERSION: 3.1.11
40+
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
41+
- nodejs_version: 10
42+
platform: x86
43+
NODE_RUNTIME: electron
44+
NODE_RUNTIME_VERSION: 3.1.11
45+
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
1546

1647
os: Visual Studio 2015
1748

‎scripts/build-appveyor.bat‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
3838
powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
3939
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
4040

41-
:SKIP_APPVEYOR_INSTALL
42-
4341
ECHO available node.exe^:
4442
call where node
4543
ECHO available npm^:
@@ -123,14 +121,6 @@ ECHO calling npm test
123121
CALL npm test
124122
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
125123

126-
ECHO calling electron-rebuild
127-
CALL .\node_modules\.bin\electron-rebuild --force
128-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
129-
130-
ECHO calling electron-mocha
131-
CALL .\node_modules\.bin\electron-mocha --timeout 480000
132-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
133-
134124
:NPM_TEST_FINISHED
135125
ECHO packaging for node-gyp
136126
CALL node_modules\.bin\node-pre-gyp package %TOOLSET_ARGS%
@@ -139,28 +129,6 @@ SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
139129
IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL node_modules\.bin\node-pre-gyp --msvs_version=%msvs_version% publish %TOOLSET_ARGS%) ELSE (ECHO not publishing)
140130
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
141131

142-
:: Do the same for electron
143-
CALL node_modules\.bin\node-pre-gyp rebuild package %TOOLSET_ARGS% --runtime=electron --target=1.7.11 --disturl=https://atom.io/download/electron
144-
SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
145-
IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL node_modules\.bin\node-pre-gyp --msvs_version=%msvs_version% publish %TOOLSET_ARGS% --runtime=electron --target=1.7.11 --disturl=https://atom.io/download/electron) ELSE (ECHO not publishing)
146-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
147-
148-
149-
CALL node_modules\.bin\node-pre-gyp rebuild package %TOOLSET_ARGS% --runtime=electron --target=1.8.6 --disturl=https://atom.io/download/electron
150-
SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
151-
IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL node_modules\.bin\node-pre-gyp --msvs_version=%msvs_version% publish %TOOLSET_ARGS% --runtime=electron --target=1.8.6 --disturl=https://atom.io/download/electron) ELSE (ECHO not publishing)
152-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
153-
154-
CALL node_modules\.bin\node-pre-gyp rebuild package %TOOLSET_ARGS% --runtime=electron --target=2.0.4 --disturl=https://atom.io/download/electron
155-
SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
156-
IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL node_modules\.bin\node-pre-gyp --msvs_version=%msvs_version% publish %TOOLSET_ARGS% --runtime=electron --target=2.0.4 --disturl=https://atom.io/download/electron) ELSE (ECHO not publishing)
157-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
158-
159-
CALL node_modules\.bin\node-pre-gyp rebuild package %TOOLSET_ARGS% --runtime=electron --target=5.0.6 --disturl=https://atom.io/download/electron
160-
SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE%
161-
IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL node_modules\.bin\node-pre-gyp --msvs_version=%msvs_version% publish %TOOLSET_ARGS% --runtime=electron --target=5.0.6 --disturl=https://atom.io/download/electron) ELSE (ECHO not publishing)
162-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
163-
164132
GOTO DONE
165133

166134

@@ -173,4 +141,4 @@ SET EL=%ERRORLEVEL%
173141
:DONE
174142
ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
175143

176-
EXIT /b %EL%
144+
EXIT /b %EL%

0 commit comments

Comments
 (0)