Skip to content

Commit f12d3b0

Browse files
mtgtomtgto
authored
electron: fix dist url (#1282)
Deprecated since Electron v7.0. https://github.com/electron/electron/blob/master/docs/breaking-changes.md#node-headers-url
1 parent 1afb915 commit f12d3b0

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,11 @@ Set the location where `make` installed it:
181181

182182
Running sqlite3 through [electron-rebuild](https://github.com/electron/electron-rebuild) does not preserve the sqlcipher extension, so some additional flags are needed to make this build Electron compatible. Your `npm install sqlite3 --build-from-source` command needs these additional flags (be sure to replace the target version with the current Electron version you are working with):
183183

184-
--runtime=electron --target=1.7.6 --dist-url=https://atom.io/download/electron
184+
--runtime=electron --target=1.7.6 --dist-url=https://electronjs.org/headers
185185

186186
In the case of MacOS with Homebrew, the command should look like the following:
187187

188-
npm install sqlite3 --build-from-source --sqlite_libname=sqlcipher --sqlite=`brew --prefix` --runtime=electron --target=1.7.6 --dist-url=https://atom.io/download/electron
188+
npm install sqlite3 --build-from-source --sqlite_libname=sqlcipher --sqlite=`brew --prefix` --runtime=electron --target=1.7.6 --dist-url=https://electronjs.org/headers
189189

190190
# Testing
191191

‎appveyor.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,136 +47,136 @@ environment:
4747
platform: x64
4848
NODE_RUNTIME: electron
4949
NODE_RUNTIME_VERSION: 7.1.0
50-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
50+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
5151
- nodejs_version: 12
5252
platform: x86
5353
NODE_RUNTIME: electron
5454
NODE_RUNTIME_VERSION: 7.1.0
55-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
55+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
5656
- nodejs_version: 12
5757
platform: x64
5858
NODE_RUNTIME: electron
5959
NODE_RUNTIME_VERSION: 7.0.0
60-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
60+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
6161
- nodejs_version: 12
6262
platform: x86
6363
NODE_RUNTIME: electron
6464
NODE_RUNTIME_VERSION: 7.0.0
65-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
65+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
6666
- nodejs_version: 12
6767
platform: x64
6868
NODE_RUNTIME: electron
6969
NODE_RUNTIME_VERSION: 6.1.0
70-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
70+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
7171
- nodejs_version: 12
7272
platform: x86
7373
NODE_RUNTIME: electron
7474
NODE_RUNTIME_VERSION: 6.1.0
75-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
75+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
7676
- nodejs_version: 12
7777
platform: x64
7878
NODE_RUNTIME: electron
7979
NODE_RUNTIME_VERSION: 6.0.0
80-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
80+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
8181
- nodejs_version: 12
8282
platform: x86
8383
NODE_RUNTIME: electron
8484
NODE_RUNTIME_VERSION: 6.0.0
85-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
85+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
8686
- nodejs_version: 12
8787
platform: x64
8888
NODE_RUNTIME: electron
8989
NODE_RUNTIME_VERSION: 5.0.0
90-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
90+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
9191
- nodejs_version: 12
9292
platform: x86
9393
NODE_RUNTIME: electron
9494
NODE_RUNTIME_VERSION: 5.0.0
95-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
95+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
9696
- nodejs_version: 10
9797
platform: x64
9898
NODE_RUNTIME: electron
9999
NODE_RUNTIME_VERSION: 4.2.0
100-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
100+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
101101
- nodejs_version: 10
102102
platform: x64
103103
NODE_RUNTIME: electron
104104
NODE_RUNTIME_VERSION: 4.1.0
105-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
105+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
106106
- nodejs_version: 10
107107
platform: x64
108108
NODE_RUNTIME: electron
109109
NODE_RUNTIME_VERSION: 4.0.0
110-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
110+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
111111
- nodejs_version: 10
112112
platform: x86
113113
NODE_RUNTIME: electron
114114
NODE_RUNTIME_VERSION: 4.0.0
115-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
115+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
116116
- nodejs_version: 10
117117
platform: x64
118118
NODE_RUNTIME: electron
119119
NODE_RUNTIME_VERSION: 3.0.6
120-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
120+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
121121
- nodejs_version: 10
122122
platform: x86
123123
NODE_RUNTIME: electron
124124
NODE_RUNTIME_VERSION: 3.0.6
125-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
125+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
126126
- nodejs_version: 8
127127
platform: x64
128128
NODE_RUNTIME: electron
129129
NODE_RUNTIME_VERSION: 2.0.1
130-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
130+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
131131
- nodejs_version: 8
132132
platform: x86
133133
NODE_RUNTIME: electron
134134
NODE_RUNTIME_VERSION: 2.0.1
135-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
135+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
136136
- nodejs_version: 8
137137
platform: x64
138138
NODE_RUNTIME: electron
139139
NODE_RUNTIME_VERSION: 1.8.4
140-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
140+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
141141
- nodejs_version: 8
142142
platform: x86
143143
NODE_RUNTIME: electron
144144
NODE_RUNTIME_VERSION: 1.8.4
145-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
145+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
146146
- nodejs_version: 7
147147
platform: x64
148148
NODE_RUNTIME: electron
149149
NODE_RUNTIME_VERSION: 1.7.12
150-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
150+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
151151
- nodejs_version: 7
152152
platform: x86
153153
NODE_RUNTIME: electron
154154
NODE_RUNTIME_VERSION: 1.7.12
155-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
155+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
156156
- nodejs_version: 6
157157
platform: x64
158158
msvs_toolset: 12
159159
NODE_RUNTIME: electron
160160
NODE_RUNTIME_VERSION: 1.6.2
161-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
161+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
162162
- nodejs_version: 6
163163
platform: x86
164164
msvs_toolset: 12
165165
NODE_RUNTIME: electron
166166
NODE_RUNTIME_VERSION: 1.6.2
167-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
167+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
168168
- nodejs_version: 6
169169
platform: x64
170170
msvs_toolset: 12
171171
NODE_RUNTIME: electron
172172
NODE_RUNTIME_VERSION: 1.3.14
173-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
173+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
174174
- nodejs_version: 6
175175
platform: x86
176176
msvs_toolset: 12
177177
NODE_RUNTIME: electron
178178
NODE_RUNTIME_VERSION: 1.3.14
179-
TOOLSET_ARGS: --dist-url=https://atom.io/download/electron
179+
TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
180180

181181
os: Visual Studio 2015
182182

‎scripts/build_against_electron.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ~/.nvm/nvm.sh
55
set -e -u
66

77
export DISPLAY=":99.0"
8-
GYP_ARGS="--runtime=electron --target=${ELECTRON_VERSION} --dist-url=https://atom.io/download/electron"
8+
GYP_ARGS="--runtime=electron --target=${ELECTRON_VERSION} --dist-url=https://electronjs.org/headers"
99
NPM_BIN_DIR="$(npm bin -g 2>/dev/null)"
1010

1111
function publish() {

0 commit comments

Comments
 (0)
⚡