Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
update cross-windows electron versions
  • Loading branch information
cleverca22 committed Mar 14, 2019
1 parent b2f5c2e commit cf8a39d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion scripts/build-installer-nix.sh
Expand Up @@ -22,7 +22,7 @@ nix-build default.nix -A rawapp.deps -o node_modules.root -Q
for cluster in ${CLUSTERS} for cluster in ${CLUSTERS}
do do
echo '~~~ Building '"${cluster}"' installer' echo '~~~ Building '"${cluster}"' installer'
nix-build -Q release.nix -A "${cluster}.installer" --argstr buildNum "$BUILDKITE_BUILD_NUMBER" -o csl-daedalus nix-build -Q release.nix -A "${cluster}.installer.x86_64-linux" --argstr buildNum "$BUILDKITE_BUILD_NUMBER" -o csl-daedalus
if [ -n "${BUILDKITE_JOB_ID:-}" ]; then if [ -n "${BUILDKITE_JOB_ID:-}" ]; then
upload_artifacts_public csl-daedalus/daedalus*.bin upload_artifacts_public csl-daedalus/daedalus*.bin
nix-build -A daedalus.cfg --argstr cluster "${cluster}" nix-build -A daedalus.cfg --argstr cluster "${cluster}"
Expand Down
10 changes: 5 additions & 5 deletions yarn2nix.nix
Expand Up @@ -26,19 +26,19 @@ let
main = "main/index.js"; main = "main/index.js";
}; };
newPackagePath = builtins.toFile "package.json" (builtins.toJSON newPackage); newPackagePath = builtins.toFile "package.json" (builtins.toJSON newPackage);
windowsElectronVersion = "3.0.14"; windowsElectronVersion = "4.1.0";
windowsElectron = fetchurl { windowsElectron = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${windowsElectronVersion}/electron-v${windowsElectronVersion}-win32-x64.zip"; url = "https://github.com/electron/electron/releases/download/v${windowsElectronVersion}/electron-v${windowsElectronVersion}-win32-x64.zip";
sha256 = "0cqwjmv1ymwa309v025szs6681f891s6ks653jd5mh55hp1vpn0b"; sha256 = "12civ34di87w467g0ckv2v6prrh25kfciy24jw1js4brwvkbpn87";
}; };
checksums = fetchurl { checksums = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${windowsElectronVersion}/SHASUMS256.txt"; url = "https://github.com/electron/electron/releases/download/v${windowsElectronVersion}/SHASUMS256.txt";
sha256 = "103m5kxgb64clx68qqfvxdz2pah249lk344mjxqj94i83v9bxd2j"; sha256 = "02lil23id40pdyjqgfrw5qnp7g7pqbzd7hq6scj719a1v1l84hnf";
}; };
electron-cache = runCommand "electron-cache" {} '' electron-cache = runCommand "electron-cache" {} ''
mkdir $out mkdir $out
ln -s ${windowsElectron} $out/electron-v3.0.14-win32-x64.zip ln -s ${windowsElectron} $out/electron-v${windowsElectronVersion}-win32-x64.zip
ln -s ${checksums} $out/SHASUMS256.txt-3.0.14 ln -s ${checksums} $out/SHASUMS256.txt-${windowsElectronVersion}
''; '';
filter = name: type: let filter = name: type: let
baseName = baseNameOf (toString name); baseName = baseNameOf (toString name);
Expand Down

0 comments on commit cf8a39d

Please sign in to comment.