Christopher Willis-Ford
78d75dc3cf
assume direct control of webpack config
...
Instead of overriding rules we don't want by matching the test exactly,
we now explicitly delete rules we don't want before adding any of our
custom rules.
2020-08-11 17:17:15 -07:00
Christopher Willis-Ford
b50870a992
npm run rebuild-deps
2020-08-10 18:50:14 -07:00
Christopher Willis-Ford
6f7f6bb674
add script to merge scratch-gui deps
...
This is in preparation for having webpack build scratch-gui source
instead of consuming its build output. This script merges the
dependencies listed in package-deps.json with those listed in
scratch-gui's package.json, using the package-deps.json version in case
of conflict, then writes the result into the `devDependencies` section
of scratch-desktop's package.json.
2020-08-10 18:46:26 -07:00
Christopher Willis-Ford
fa5312721a
3.13.1
2020-08-04 11:04:28 -07:00
Chris Willis-Ford
5ce37f7510
Merge pull request #136 from cwillisf/undo-rename
...
Revert "Merge pull request #131 from cwillisf/rename-to-scratch"
2020-08-04 10:55:46 -07:00
Christopher Willis-Ford
0817fddce1
Revert "Merge pull request #131 from cwillisf/rename-to-scratch"
...
This reverts commit 71cc32e5bf43daa269df
2020-08-04 10:41:32 -07:00
Chris Willis-Ford
8f4cab598e
Merge pull request #130 from LLK/circleci
...
Add automated CircleCI builds
2020-08-03 13:35:45 -07:00
Christopher Willis-Ford
b17f1a6d8f
add comments based on code review feedback
2020-08-03 13:18:40 -07:00
Christopher Willis-Ford
f49216f198
work around electron-userland/electron-builder#5016
2020-07-31 20:18:46 -07:00
Christopher Willis-Ford
b5b432786a
replace Code-to-Learn certs with Scratch Foundation certs
2020-07-31 15:13:48 -07:00
Christopher Willis-Ford
686ba5bf0c
3.13.0
2020-07-30 08:40:19 -07:00
Christopher Willis-Ford
7053eed00f
Merge branch 'develop' into circleci
2020-07-29 14:30:47 -07:00
Christopher Willis-Ford
e0dd256c45
update scratch-gui to #scratch-desktop-v3.13.0
2020-07-29 14:27:02 -07:00
Christopher Willis-Ford
025ad1b7a8
Merge branch 'develop' into circleci
2020-07-28 15:30:12 -07:00
Chris Willis-Ford
71cc32e5bf
Merge pull request #131 from cwillisf/rename-to-scratch
...
Rename to "Scratch" / "the Scratch app"
2020-07-28 15:24:55 -07:00
Christopher Willis-Ford
e69d5414c6
prepare CircleCI config for renaming app
2020-07-27 11:54:03 -07:00
Christopher Willis-Ford
97167537eb
rename 'Scratch Desktop' to 'Scratch' / 'the Scratch app'
2020-07-27 11:43:49 -07:00
Christopher Willis-Ford
84f0701f41
override provisioning profile for mas-dev build
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
b4ce74b002
ZIP mas-dev
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
7c7ddd1e6c
build mas-dev on CircleCI
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
8868556cba
win: unset context to fix environment size errors
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
a4d8e3de36
fix Windows executor settings
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
472cad2172
fix support for non-signed CI builds
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
62e23771db
win: set WIN_CSC_LINK to filename
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
000bff75ed
support notarize with password or keychain
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
61251d111f
tell electron-builder not to publish CI builds
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
104317bff8
build 'dist' for signed, 'distDev' for unsigned
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
ed23e98d24
import provision profile
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
623050a19d
test early during automated builds
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
0d3f50e790
import code-signing certificates
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
98efe7610f
work around electron-userland/electron-builder#4964
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
9ca7f05bdb
update CircleCI context name
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
d08841382a
modularize npm scripts, support non-signed builds, ...
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
8cf475416c
work around missing PATH for git-sh-setup on Windows
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
39dbd197d6
cache the NPM cache, not node_modules
...
The `npm ci` command removes `node_modules` anyway, so there's no point
in caching it.
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
245a3ec0d7
put scratch-gui install into scratch-desktop postinstall
2020-07-24 17:07:21 -07:00
Christopher Willis-Ford
2cfca4c0ff
reference scratch-gui by branch, not tag
...
Let package-lock.json take care of picking an exact commit.
2020-07-24 17:07:15 -07:00
Christopher Willis-Ford
1c7148607c
add CircleCI build config for macOS
2020-07-24 17:05:25 -07:00
Christopher Willis-Ford
ff53e9822a
add CircleCI build config for Windows
2020-07-24 17:05:25 -07:00
Christopher Willis-Ford
43daa269df
fix scratch-gui dependency versions
2020-07-24 15:58:14 -07:00
Christopher Willis-Ford
9762bac510
3.12.0
2020-06-22 10:46:31 -07:00
DD Liu
c33abcba84
Update CONTRIBUTING.md
2020-06-09 17:04:00 -04:00
Christopher Willis-Ford
ba223fef2d
3.11.1
2020-06-04 00:55:21 -07:00
Christopher Willis-Ford
bc8ca72434
3.11.0
2020-06-03 17:23:53 -07:00
Christopher Willis-Ford
05e6b27793
bump scratch-gui dependency
2020-06-03 17:22:45 -07:00
Christopher Willis-Ford
c36c5c90f4
use 32-bit Electron for NSIS installer
...
Use 'nsis:ia32' instead of just 'nsis' for the Windows direct-download
build. This means we explicitly request a 32-bit build rather than
allowing electron-builder to default; the default is currently to make a
64-bit build.
resolves #114
2020-06-03 16:33:49 -07:00
Chris Willis-Ford
6d9ab116bb
Merge pull request #120 from cwillisf/electron-8
...
Electron 8 & fix App Store submission
2020-06-03 16:09:03 -07:00
Christopher Willis-Ford
8f23ef1f64
3.10.4
2020-05-22 16:25:59 -07:00
Christopher Willis-Ford
7192ffe878
fix MAS build (!!!)
...
apparently the `com.apple.security.app-sandbox` entitlement and the
`hardenedRuntime: true` setting are mututally exclusive with
`electron-builder`, so the hardened runtime is now only used by non-MAS
builds ('mac' but not 'mas' or 'mas-dev')
2020-05-22 16:19:05 -07:00
Christopher Willis-Ford
1bc9f570cd
allow non-notarized mac build for testing
...
Skipping notarization isn't strictly wrong, but needs a big warning
since the build probably won't run on Catalina.
2020-05-22 16:16:56 -07:00
