Skip to content

Commit 3158c81

Browse files
committed
relax mina-devnet-deb names
1 parent 162d541 commit 3158c81

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

buildkite/src/Command/DockerImage.dhall

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ let DockerPublish = ../Constants/DockerPublish.dhall
2828

2929
let VerifyDockers = ../Command/Packages/VerifyDockers.dhall
3030

31-
let Extensions = ../Lib/Extensions.dhall
32-
3331
let Arch = ../Constants/Arch.dhall
3432

3533
let ReleaseSpec =
@@ -120,26 +118,6 @@ let generateStep =
120118

121119
else " && ./scripts/debian/aptly.sh stop"
122120

123-
let suffix =
124-
Extensions.joinOptionals
125-
"-"
126-
[ merge
127-
{ Mainnet = None Text
128-
, Devnet = None Text
129-
, Dev = None Text
130-
, Lightnet = Some
131-
"${Profiles.toSuffixLowercase spec.deb_profile}"
132-
}
133-
spec.deb_profile
134-
, merge
135-
{ None = None Text
136-
, Instrumented = Some
137-
"${BuildFlags.toSuffixLowercase spec.build_flags}"
138-
}
139-
spec.build_flags
140-
, spec.deb_suffix
141-
]
142-
143121
let debSuffix =
144122
merge
145123
{ None = "", Some = \(s : Text) -> " --deb-suffix " ++ s }
@@ -158,8 +136,9 @@ let generateStep =
158136
, networks = [ spec.network ]
159137
, version = spec.deb_version
160138
, codenames = [ spec.deb_codename ]
161-
, suffix = suffix
162-
, arch = spec.arch
139+
, profile = spec.deb_profile
140+
, buildFlag = spec.build_flags
141+
, archs = [ spec.arch ]
163142
}
164143

165144
else ""

scripts/debian/builder-helpers.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ case "${MINA_DEB_CODENAME}" in
5151
esac
5252

5353
MINA_DEB_NAME="mina-berkeley"
54+
MINA_DEVNET_DEB_NAME="mina-devnet"
5455
DUNE_PROFILE="${DUNE_PROFILE}"
5556
DEB_SUFFIX=""
5657

@@ -63,6 +64,7 @@ case "${DUNE_PROFILE}" in
6364
_SUFFIX=${DUNE_PROFILE//_/-}
6465
DEB_SUFFIX="${_SUFFIX}"
6566
MINA_DEB_NAME="${MINA_DEB_NAME}-${DEB_SUFFIX}"
67+
MINA_DEVNET_DEB_NAME="${MINA_DEVNET_DEB_NAME}-${DEB_SUFFIX}"
6668
;;
6769
esac
6870

@@ -387,7 +389,7 @@ build_daemon_devnet_deb() {
387389

388390
copy_common_daemon_configs devnet testnet 'seed-lists/devnet_seeds.txt'
389391

390-
build_deb mina-devnet
392+
build_deb "${MINA_DEVNET_DEB_NAME}"
391393
}
392394
## END DEVNET PACKAGE ##
393395

0 commit comments

Comments
 (0)