Merge pull request #15776 from MinaProtocol/port/_port/_master_nightl…

…y_test_to_compatible_to_develop [Merge Conflict Fix] port Master nightly CI fix to develop
MinaProtocol · Jun 26, 2024 · 10a0bf9 · 10a0bf9
2 parents 7766545 + 5374c88
commit 10a0bf9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/buildkite/scripts/export-git-env-vars.sh b/buildkite/scripts/export-git-env-vars.sh
@@ -51,16 +51,17 @@ fi
 
 
 export MINA_DEB_VERSION="${GITTAG}-${GITBRANCH}-${GITHASH}"
-export MINA_DOCKER_TAG="$(echo "${MINA_DEB_VERSION}-${MINA_DEB_CODENAME}" | sed 's!/!-!g; s!_!-!g; s!#!-!g')"
+export MINA_DOCKER_TAG="$(echo "${MINA_DEB_VERSION}-${MINA_DEB_CODENAME}" | sed 's!/!-!g; s!_!-!g')"
+export RELEASE=unstable
 
 # Determine the packages to build (mainnet y/N)
 case $GITBRANCH in
-    compatible|master|release-automation-testing/*|release/1*|release/3*) # whitelist of branches that are "mainnet-like"
+    master|hot-fix/*|release/*) # whitelist of branches that are "mainnet-like"
       export MINA_BUILD_MAINNET=true ;;
     *) # Other branches
       export MINA_BUILD_MAINNET=false ;;
 esac
 
 echo "Publishing on release channel \"${RELEASE}\""
 [[ -n ${THIS_COMMIT_TAG} ]] && export MINA_COMMIT_TAG="${THIS_COMMIT_TAG}"
-export MINA_DEB_RELEASE="${RELEASE}"
+export MINA_DEB_RELEASE="${RELEASE}"
diff --git a/buildkite/src/Jobs/Lint/Merge.dhall b/buildkite/src/Jobs/Lint/Merge.dhall
@@ -30,7 +30,6 @@ Pipeline.build
           commands = [ Cmd.run "buildkite/scripts/merges-cleanly.sh compatible"]
           , label = "Check merges cleanly into compatible"
           , key = "clean-merge-compatible"
-          , soft_fail = Some (B/SoftFail.Boolean True)
           , target = Size.Small
           , docker = Some Docker::{
               image = (../../Constants/ContainerImages.dhall).toolchainBase

diff --git a/scripts/deb-builder-helpers.sh b/scripts/deb-builder-helpers.sh
@@ -303,7 +303,7 @@ build_daemon_deb() {
     echo "------------------------------------------------------------"
     echo "--- Building testnet signatures deb without keys:"
 
-    copy_control_file mina-devnet "${SHARED_DEPS}${DAEMON_DEPS}" 'Mina Protocol Client and Daemon for the Devnet Network'
+    create_control_file mina-devnet "${SHARED_DEPS}${DAEMON_DEPS}" 'Mina Protocol Client and Daemon for the Devnet Network' "${SUGGESTED_DEPS}"
 
     copy_common_daemon_configs devnet testnet 'seed-lists/devnet_seeds.txt'