Skip to content

Commit c90fea0

Browse files
authored
[DDW-1224] Remove process.env.BUILD_COUNTER from environment.version (#3130)
* Remove `process.env.BUILD_COUNTER` from `environment.version` * Separate buildCounter with dashes (not dots) in artifact filenames
1 parent 92bc587 commit c90fea0

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

installers/common/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ packageFileName uglyName _os cluster ver backend buildJob buildCounter = fromTex
139139
else "x86_64-darwin"
140140
Linux64 -> "x86_64-linux"
141141
buildJob' = maybe [] (\b -> [fromBuildJob b]) buildJob
142-
buildCounter' = "." <> maybe "0" fromBuildJob buildCounter
142+
buildCounter' = "-" <> maybe "0" fromBuildJob buildCounter
143143

144144
instance FromJSON Version where
145145
parseJSON = withObject "Package" $ \o -> Version <$> o .: "version"

nix/any-darwin.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let
1717

1818
archSuffix = if pkgs.system == "aarch64-darwin" then "arm64" else "x64";
1919
packageVersion = originalPackageJson.version;
20-
installerName = "daedalus-${packageVersion}.${toString sourceLib.buildCounter}-${cluster}-${sourceLib.buildRevShort}-${pkgs.system}";
20+
installerName = "daedalus-${packageVersion}-${toString sourceLib.buildCounter}-${cluster}-${sourceLib.buildRevShort}-${pkgs.system}";
2121

2222
in rec {
2323

nix/x86_64-linux.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ in rec {
300300

301301
wrappedBundle = let
302302
version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
303-
fn = "daedalus-${version}.${toString sourceLib.buildCounter}-${linuxClusterBinName}-${sourceLib.buildRevShort}-x86_64-linux.bin";
303+
fn = "daedalus-${version}-${toString sourceLib.buildCounter}-${linuxClusterBinName}-${sourceLib.buildRevShort}-x86_64-linux.bin";
304304
in pkgs.runCommand fn {} ''
305305
mkdir -p $out
306306
cp ${newBundle} $out/${fn}

source/main/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
checkIsLinux,
2424
} from '../common/utils/environmentCheckers';
2525

26-
const version = `${packageJson.version}.${process.env.BUILD_COUNTER || '0'}`;
26+
const version = `${packageJson.version}`;
2727
// Daedalus requires minimum 16 gigabytes of RAM, but some devices having 16 GB
2828
// actually have a slightly smaller RAM size (eg. 15.99 GB), therefore we used 15 GB threshold
2929
//

0 commit comments

Comments
 (0)