Commit graph

171 commits

Author SHA1 Message Date
David Baker
e2a6cc3196 Remove certificateSubjectName which didn't work
and comment cert file hard-coded hack
2020-03-06 16:14:51 +00:00
David Baker
aad1e8388e Nope, that didn't work. Try the cert file, 2020-03-06 15:57:25 +00:00
David Baker
83746b5709 let's try this format 2020-03-06 15:52:54 +00:00
David Baker
781eff95ac hardcode cert sha1 to test 2020-03-06 15:51:39 +00:00
David Baker
d403b86690 Removing logging 2020-03-06 15:34:36 +00:00
David Baker
bffee2d4c3 Add csp option which is apparently required 2020-03-06 15:01:50 +00:00
David Baker
1585e370d3 It's options.options in the original so keep it that way 2020-03-06 14:55:14 +00:00
David Baker
7f25e23878 Also try actually returning the value 2020-03-06 14:50:53 +00:00
David Baker
763b176b2e variable name 2020-03-06 14:49:55 +00:00
David Baker
5c85de4934 Fix synatx hopefully 2020-03-06 14:47:09 +00:00
David Baker
f961513212 args, not options 2020-03-06 14:38:13 +00:00
David Baker
6e8f8dcdce Define the args variable
also it's not osslsigncode anymore
2020-03-06 14:35:09 +00:00
David Baker
cee7410388 also just one level of options 2020-03-06 14:32:02 +00:00
David Baker
8cbef5b5e5 name the function the same thing 2020-03-06 14:29:11 +00:00
David Baker
da606bcd6d Too many dots 2020-03-06 14:22:06 +00:00
David Baker
4dbbf2bb15 Add a windows signing script
As electron builder doesn't support supplying a key container name
which is the only way we can supply the token passphrase
2020-03-04 16:55:12 +00:00
Michael Telatynski
eac8118452 Small comment tweaks 2020-03-02 16:45:28 +00:00
David Baker
638fcabf16
Merge pull request #35 from vector-im/dbkr/exitcode
Exit with exit code on exception
2020-02-28 09:36:44 +00:00
David Baker
8aac5928a2
Merge pull request #34 from vector-im/dbkr/fix-set-version
Fix the set-version script
2020-02-28 09:31:59 +00:00
David Baker
de1090cc18 Actually pass a function 2020-02-27 21:43:19 +00:00
David Baker
8b8203cea8 Exit with exit code on exception
Otherwise running the check script will just exit with 0 which is
pointless.
2020-02-27 21:37:07 +00:00
David Baker
67a4c99907 Fix the set-version script
Call the right function to set package version and await
2020-02-27 17:34:34 +00:00
David Baker
f48692bddb Merge branch 'master' into dbkr/docker-env 2020-02-27 17:30:55 +00:00
David Baker
18dbad4e8c Revert e0631770b5 & 9ec2407957
Which were accidentally comitted to master and also completely wrong
as it sets the version to the literal 'develop' which is silly.
2020-02-27 17:30:00 +00:00
David Baker
fca983cc7d Merge branch 'master' into dbkr/docker-env 2020-02-27 17:22:38 +00:00
David Baker
9ec2407957 Don't shadow the import 2020-02-27 17:22:10 +00:00
David Baker
a76ebed5d2 Merge branch 'master' into dbkr/docker-env 2020-02-27 17:19:49 +00:00
David Baker
e0631770b5 Always update deb version
We always need the debian version to be correct.
2020-02-27 17:17:51 +00:00
David Baker
af1f4715be Pass through the env var we actually use to docker 2020-02-27 16:52:09 +00:00
David Baker
f58532b556 The variable is called this thing now 2020-02-26 11:59:18 +00:00
David Baker
40dc1d9384 Set version in fetch script
Which plays better with doing develop builds.
2020-02-26 11:56:59 +00:00
David Baker
0c28d1bfb2 Use needle consistently
and remove unused variable
2020-02-21 18:25:33 +00:00
David Baker
b94c52c244 Support fetching the latest develop build
Frustratingly, this requires a buildkite API token, even though
the builds & artifacts are available without auth on the buildkite
website.
2020-02-21 18:17:31 +00:00
David Baker
90913256f5 Add our native modules separately into the files
And also the package.json which, for reasons I'm not going to spend
the next two hours of my life wading through the electron-builder
source to discover, is no longer automatically included after adding
the files pattern. The node_modules folder is handled automatically
though, so is redundant.

Change the output directory structure so we have one directory with
all the built native modules under that we can just add to the files,
rather than having to add each one separately.

NB. electron-builder add its own filters to node_modules so that only
runtime (ie. not devDependencies) are copied. These seem to apply
even for manually specified path within node_modules. We can copy *to*
the node_modules directory, however...
2020-02-21 10:57:52 +00:00
David Baker
dd6f52e2de Fix setversion script's yarn call on windows 2020-02-19 14:34:27 +00:00
David Baker
7b8ae78038 More comment 2020-02-19 10:07:02 +00:00
David Baker
cb96b41645 Merge remote-tracking branch 'origin/master' into dbkr/hak_win_x86 2020-02-19 10:01:18 +00:00
David Baker
da5a0e63ec
Merge pull request #22 from vector-im/dbkr/hak_linux
Build seshat on Linux
2020-02-19 10:00:07 +00:00
David Baker
3b642389f2 First attempt at 32 bit windows building 2020-02-18 11:01:34 +00:00
David Baker
c6784f829a
Apply suggestions from code review
More fixes under, 'typing is hard'

Co-Authored-By: poljar <poljar@termina.org.uk>
2020-02-18 09:59:09 +00:00
David Baker
13c627ff64
Typing
Co-Authored-By: poljar <poljar@termina.org.uk>
2020-02-18 09:58:09 +00:00
David Baker
52032aac14 Docker powered linux building 2020-02-17 20:10:58 +00:00
David Baker
0bfc970619 Document more awfulness 2020-02-17 17:31:01 +00:00
David Baker
0ccc29e504 missed the script 2020-02-17 15:52:41 +00:00
David Baker
19ee3d4aff Add some checks for the tools we need
May not be exhastive, but useful on Windows where you need to
remember to install stuff.
2020-02-17 15:44:06 +00:00
David Baker
5fc72e8f73 Lint scripts dir 2020-02-17 14:49:26 +00:00
David Baker
046170e3ec Less hacky fix for yarnrc 2020-02-15 20:17:35 +00:00
David Baker
a0d9359ef0 Working seshat building on Windows 2020-02-15 16:52:41 +00:00
David Baker
0258d456e6 Initial commit of native dependency building. 2020-02-13 23:52:16 +00:00
David Baker
3716545085 Typo 2020-02-04 22:19:28 +00:00
David Baker
4d2c8883de Use jq 2019-12-13 17:21:24 +00:00
David Baker
54421f8dc6 Merge remote-tracking branch 'origin/master' into dbkr/debrepo 2019-12-13 17:19:38 +00:00
David Baker
5bfd0ed383
Merge pull request #17 from vector-im/dbkr/moredocker
Better Docker Support
2019-12-13 17:18:16 +00:00
David Baker
39c6db4063
Merge pull request #14 from vector-im/dbkr/debcontrol
Use a custom control file for the Debian package
2019-12-13 17:16:43 +00:00
David Baker
bc90d011ae set both on one line 2019-12-13 16:46:29 +00:00
David Baker
9a3c0f7cdc rename indocker script 2019-12-13 16:37:07 +00:00
David Baker
39c5e64406 Bundle deb into a repo 2019-12-13 16:14:33 +00:00
David Baker
6def288521 Slightly better docker support
So you can run yarn install in the docker container
2019-12-13 12:17:54 +00:00
David Baker
dc42e2cafa
Merge pull request #15 from vector-im/dbkr/config
Support config directories
2019-12-13 11:46:43 +00:00
David Baker
8931242580 Don't bail if we can't notarise
Just print a big fat warning instead.
2019-12-13 11:21:34 +00:00
David Baker
e214c0f19f Support config directories 2019-12-13 11:13:44 +00:00
David Baker
6e6e7d82c8 Use a custom control file for the Debian package
So we can say we replace the riot-web package
2019-12-13 10:45:27 +00:00
David Baker
3b58fdc8d9 Set version automatically
Convert the check script to a script that sets the version to match
whatever Riot is being packaged.

Add a README because the two ways of interacting with versions are
starting to get complex to reason about.

Also add a docker build script.
2019-12-12 19:33:29 +00:00
David Baker
dff36277c4 Sign natively on Windows
* Replace the windows signing script with certificateSubjectName
   option which finds the right certificate from the smart card
 * Remove the windows signing script as electron-builder does it
   out-of-the-box on windows
 * Remove the cert file which isn't necessary with native signing
2019-12-11 17:34:19 +00:00
David Baker
672b846364 Pack the webapp into an asar 2019-12-10 15:54:17 +00:00
David Baker
b8f0ef30d2 Exit after importing key 2019-12-10 14:50:57 +00:00
David Baker
51227abd2a PUB_KEY_URL 2019-12-09 13:59:38 +00:00
David Baker
529ffe4513 Merge branch 'master' into dbkr/make_it_work 2019-12-09 13:25:41 +00:00
David Baker
52e7532789 Add electron-package script (copied verbatim) 2019-12-09 12:50:45 +00:00
David Baker
5a0c1cda22 Files I've added
This still won't work, still a WIP
2019-12-06 18:20:31 +00:00
David Baker
a2c5d6176f Initial copy of files from the riot-web repo
None of this will work as it will need tweaking (at the very least
I've not copied the origin migrator because that's had long enough)
but these are files which already existed in their current state and
so don't need re-reviewing.
2019-12-06 18:17:34 +00:00