From 929d187a288a707e1ce9833c2a66e194d89e6415 Mon Sep 17 00:00:00 2001 From: Gary Verhaegen Date: Thu, 28 Mar 2024 11:22:50 +0100 Subject: [PATCH] [release] fix daily-snapshot logic (#18905) When we manually run the daily-snapshot job to make a specific commit, the resulting release should be named based on the release commit, not the trigger commit. --- ci/daily-snapshot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/daily-snapshot.yml b/ci/daily-snapshot.yml index 0be6c7203ff..0583a37bd6f 100644 --- a/ci/daily-snapshot.yml +++ b/ci/daily-snapshot.yml @@ -34,9 +34,9 @@ jobs: eval "$(./dev-env/bin/dade-assist)" source $(bash-lib) - prefix=$(cat NIGHTLY_PREFIX) + prefix=$(git show ${{ parameters.commit }}:sdk/NIGHTLY_PREFIX) if [ "${{ parameters.version }}" = "snapshot" ]; then - release=$(./release.sh snapshot HEAD $prefix | awk '{print $2}') + release=$(./release.sh snapshot ${{ parameters.commit }} $prefix | awk '{print $2}') else release=${{ parameters.version }} fi