Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Electron 6 Take Two #21079

Merged
merged 47 commits into from
Aug 20, 2020
Merged

Electron 6 Take Two #21079

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1d263e2
⬆️ electron@6.1.12
lkashef May 19, 2020
c8ad0e7
electron-chromedriver@6.0.0
lkashef May 19, 2020
a16d2d1
electron-mksnapshot@6.0.0
lkashef May 19, 2020
e4a1a8e
scrollbar-style@3.2.1
lkashef May 19, 2020
b516f60
watcher@1.3.3
lkashef May 19, 2020
b0669ec
Upgrade scrollbar-style without electron
lkashef May 19, 2020
9e01d5a
electron 6 again and bump node to 12.4.0
lkashef May 19, 2020
ed8f4f9
Update npm version
lkashef May 19, 2020
0c25fde
try removing npm upgrade in mac job
lkashef May 19, 2020
237d3ee
install npm
lkashef May 19, 2020
5562f5f
Update macos.yml
lkashef May 19, 2020
ad3c1fa
debug npm upgrade fail
lkashef May 19, 2020
1c5bf90
update npm path
lkashef May 19, 2020
8914766
bump atom/watcher@1.3.3
lkashef May 19, 2020
98bb0d4
remove log and verify lint
lkashef May 19, 2020
ffb34f3
disable cache save
lkashef May 20, 2020
00151d4
bump watcher to 1.3.4-0
lkashef May 20, 2020
1bf5f60
correct @atom/watcher in package lock
lkashef May 20, 2020
40cb843
Update package-lock.json
lkashef May 20, 2020
29f184d
Update electron dependencies
lkashef May 20, 2020
397afde
Fix node versioin
lkashef May 20, 2020
c3f824a
downgrade to electron 13 to get targets.hostArch
lkashef May 20, 2020
891c80a
Update script to support electron-packager 14
lkashef May 20, 2020
7389cff
check out build on electron 7
lkashef May 20, 2020
9dcac63
Upgrade npm
lkashef May 20, 2020
a8047f8
back to electron 6
lkashef May 20, 2020
985dc66
Update package-lock.json
lkashef May 20, 2020
39d2bd4
Merge branch 'master' into electron-6.1.12
DeeDeeG Jun 7, 2020
29a9d32
Fix uploadToServer can't be null
lkashef Jun 12, 2020
ece51f9
Update webdriverio config to match the new schema
lkashef Jun 12, 2020
b2d3c56
Remove deprecated screen api from the cache
lkashef Jun 12, 2020
9c16e5c
Fix lint errors
lkashef Jun 12, 2020
1cef4dd
:arrow_up: electron-packager to git master
DeeDeeG Jun 16, 2020
b23b30d
Bump electron-link@0.4.3
lkashef Jul 3, 2020
bc952d5
Bump electron-packager@15.0.0
lkashef Jul 3, 2020
254bb1f
Merge branch 'master' into electron-6.1.12-bump-electron-packager-fro…
lkashef Jul 16, 2020
4bdeb86
Merge branch 'master' into electron-6.1.12-bump-electron-packager-fro…
lkashef Jul 16, 2020
1156e75
Merge branch 'master' into electron-6.1.12-bump-electron-packager-fro…
lkashef Jul 16, 2020
7b3a2bd
Merge branch 'electron-6.1.12-bump-electron-packager-from-git' of htt…
lkashef Jul 16, 2020
c6058e9
local bootstrap
lkashef Jul 16, 2020
73c7a63
re-enable the bootstrap cache on macOS CI
lkashef Jul 16, 2020
852be73
:arrow_up: find-and-replace@0.219.5
darangi Jul 21, 2020
6172046
:arrow_up: settings-view@0.261.5
darangi Jul 21, 2020
be98331
Merge pull request #21095 from atom/find-and-replace-0.219.5
darangi Jul 22, 2020
bc4309b
Merge pull request #21096 from atom/settings-view-0.261.5
darangi Jul 22, 2020
ed3bea9
:arrow_up:apm@2.5.1
darangi Aug 19, 2020
f208f2f
:arrow_up: apm@2.5.2
darangi Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump electron-packager@15.0.0
  • Loading branch information
@lkashef
lkashef committed Jul 3, 2020
commit bc952d5a3ff053bf5b9d42708fc3d794e34b4173
5 changes: 3 additions & 2 deletions script/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion script/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"electron-chromedriver": "^9.0.0",
"electron-link": "^0.4.3",
"electron-mksnapshot": "^9.0.2",
"electron-packager": "github:electron/electron-packager#65ae3fe",
"electron-packager": "^15.0.0",
"@atom/electron-winstaller": "0.0.1",
"eslint": "^5.16.0",
"eslint-config-prettier": "^4.2.0",
Expand Down