Merge pull request #16062 from MinaProtocol/dkijania/fix_debian_name_…

…logic

Fix debian branch name logic dev

buildkite/scripts/export-git-env-vars.sh

@@ -25,7 +25,12 @@ export BUILD_URL=${BUILDKITE_BUILD_URL}
 set -u
 
 export MINA_DEB_CODENAME=${MINA_DEB_CODENAME:=bullseye}
-[[ -n "$BUILDKITE_BRANCH" ]] && export GITBRANCH=$(echo "$BUILDKITE_BRANCH" | sed 's!/!-!g; s!_!-!g; s!#!-!g') || export GITBRANCH=$(git name-rev --name-only $GITHASH | sed "s/remotes\/origin\///g" | sed 's!/!-!g; s!_!-!g; s!#!-!g' )
+if [[ -n "$BUILDKITE_BRANCH" ]]; then
+   export GITBRANCH=$(echo "$BUILDKITE_BRANCH" | sed 's!/!-!g; s!_!-!g; s!#!-!g')
+else
+   export GITBRANCH=$(git name-rev --name-only $GITHASH | sed "s/remotes\/origin\///g" | sed 's!/!-!g; s!_!-!g; s!#!-!g' )
+fi
+
 
 
 export RELEASE=unstable

buildkite/scripts/run-test-executive-local.sh

@@ -37,6 +37,8 @@ fi
 # Don't prompt for answers during apt-get install
 export DEBIAN_FRONTEND=noninteractive
 
+rm -f /etc/apt/sources.list.d/hashicorp.list
+
 apt-get update
 apt-get install -y git apt-transport-https ca-certificates tzdata curl
 

buildkite/src/Command/MinaArtifact.dhall

@@ -180,7 +180,7 @@ let docker_step
                   [ DockerImage.ReleaseSpec::{
                     , deps = deps
                     , service = Artifacts.Type.BatchTxn
-                    , network = Network.lowerName Network.Type.Devnet
+                    , network = Network.lowerName spec.network
                     , deb_codename = spec.debVersion
                     , deb_profile = spec.profile
                     , build_flags = spec.buildFlags

scripts/export-git-env-vars.sh

@@ -22,7 +22,11 @@ function find_most_recent_numeric_tag() {
 export GITHASH=$(git rev-parse --short=7 HEAD)
 export THIS_COMMIT_TAG=$(git tag --points-at HEAD)
 
-[[ -n "$BRANCH_NAME" ]] && export GITBRANCH=$(echo "$BRANCH_NAME" | sed 's!/!-!g; s!_!-!g; s!#!-!g') || export GITBRANCH=$(git name-rev --name-only $GITHASH | sed "s/remotes\/origin\///g" | sed 's!/!-!g; s!_!-!g; s!#!-!g' )
+if [[ -n "$BRANCH_NAME" ]]; then
+   export GITBRANCH=$(echo "$BRANCH_NAME" | sed 's!/!-!g; s!_!-!g; s!#!-!g')
+else
+   export GITBRANCH=$(git name-rev --name-only $GITHASH | sed "s/remotes\/origin\///g" | sed 's!/!-!g; s!_!-!g; s!#!-!g' )
+fi
 
 export GITTAG=$(find_most_recent_numeric_tag HEAD)