Skip to content

Commit be8de51

Browse files
[DDW-157] Update Daedalus installer file name (#1971)
* Adds modified build product names per ddw-157 * [DDW-157] Adds a CHANGELOG * Fix Linux/Win backend reported api version Co-authored-by: John Lotoski <john.lotoski@iohk.io>
1 parent 036cf07 commit be8de51

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Changelog
1111

1212
### Chores
1313

14+
- Updated Daedalus installer file names to contain only Daedalus version, cluster name and build number ([PR 1971](https://github.com/input-output-hk/daedalus/pull/1971))
1415
- Restore the paragraph about "Automatic wallet migration" on the Daedalus Flight "Splash" screen ([PR 1967](https://github.com/input-output-hk/daedalus/pull/1967))
1516
- Updated `Electron` and it's related dependencies ([PR 1887](https://github.com/input-output-hk/daedalus/pull/1887))
1617

default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,14 @@ let
263263
makensis daedalus.nsi -V4
264264
265265
echo '~~~ Copying to $out'
266-
cp daedalus-*-*-wallet-*-windows*.exe $out/
266+
cp daedalus-*-*.exe $out/
267267
cp *.yaml $out/cfg-files/
268268
echo file installer $out/*.exe > $out/nix-support/hydra-build-products
269269
'';
270270
signed-windows-installer = let
271271
backend_version = self.daedalus-bridge.wallet-version;
272272
frontend_version = (builtins.fromJSON (builtins.readFile ./package.json)).version;
273-
fullName = "daedalus-${frontend_version}-cardano-wallet-${backend_version}-${cluster}-windows${buildNumSuffix}.exe"; # must match to packageFileName in make-installer
273+
fullName = "daedalus-${frontend_version}-${cluster}${buildNumSuffix}.exe"; # must match to packageFileName in make-installer
274274
in pkgs.runCommand "signed-windows-installer-${cluster}" {} ''
275275
mkdir $out
276276
cp -v ${self.signFile "${self.unsigned-windows-installer}/${fullName}"} $out/${fullName}
@@ -287,7 +287,7 @@ let
287287
rawapp = self.callPackage ./yarn2nix.nix {
288288
inherit buildNum;
289289
api = "ada";
290-
apiVersion = self.cardano-sl.daedalus-bridge.version;
290+
apiVersion = self.daedalus-bridge.wallet-version;
291291
inherit (self.launcherConfigs.installerConfig) spacedName;
292292
inherit (self.launcherConfigs) launcherConfig;
293293
inherit cluster;
@@ -401,7 +401,7 @@ let
401401
version = (builtins.fromJSON (builtins.readFile ./package.json)).version;
402402
backend = "cardano-wallet-${nodeImplementation}";
403403
suffix = if buildNum == null then "" else "-${toString buildNum}";
404-
fn = "daedalus-${version}-${backend}-${self.linuxClusterBinName}-${target}${suffix}.bin";
404+
fn = "daedalus-${version}-${self.linuxClusterBinName}${suffix}.bin";
405405
in pkgs.runCommand fn {} ''
406406
mkdir -p $out
407407
cp ${self.newBundle} $out/${fn}

installers/common/Types.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,18 @@ clusterNetwork Staging = "staging"
115115
clusterNetwork Testnet = "testnet"
116116

117117
packageFileName :: OS -> Cluster -> Version -> Backend -> Text -> Maybe BuildJob -> FilePath
118-
packageFileName os cluster ver backend backendVer build = fromText name <.> ext
118+
packageFileName _os cluster ver backend _backendVer build = fromText name <.> ext
119119
where
120120
name = T.intercalate "-" parts
121-
parts = ["daedalus", fromVer ver, backend', backendVer, lshowText cluster, os'] ++ build'
122-
backend' = case backend of
121+
parts = ["daedalus", fromVer ver, lshowText cluster] ++ build'
122+
_backend' = case backend of
123123
Cardano _ -> "cardano-wallet"
124124
Jormungandr _ -> "jormungandr-wallet"
125-
ext = case os of
125+
ext = case _os of
126126
Win64 -> "exe"
127127
Macos64 -> "pkg"
128128
Linux64 -> "bin"
129-
os' = case os of
129+
_os' = case _os of
130130
Win64 -> "windows"
131131
Macos64 -> "macos"
132132
Linux64 -> "linux"

scripts/build-cross-windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ for cluster in ${CLUSTERS}; do
1818
echo '~~~ Building '"${cluster}"' installer'
1919
nix-build default.nix -A windows-installer --arg disabledsigningKeys '{ spc = ./dummy-certs/authenticode.spc; pvk = ./dummy-certs/authenticode.pvk; }' --show-trace --allow-unsafe-native-code-during-evaluation --argstr cluster "$cluster" --argstr buildNum "$BUILDKITE_BUILD_NUMBER" --argstr target "x86_64-windows"
2020
if [ -n "${BUILDKITE_JOB_ID:-}" ]; then
21-
upload_artifacts_public result/daedalus-*-windows*.exe
21+
upload_artifacts_public result/daedalus-*-*.exe
2222
fi
2323
done

0 commit comments

Comments
 (0)