From 2961664cbec08529d6e37e7ac4548eca8340e56c Mon Sep 17 00:00:00 2001 From: Maksim Kazantsev Date: Fri, 17 Jul 2026 14:30:04 +0000 Subject: [PATCH] Pull request 2722: AGDNS-4274-explicitly-checkout-the-revision-in-ci Squashed commit of the following: commit c4383a8d156bfa49c229473d42b3a6e3eb6c4e3c Author: Maksim Kazantsev Date: Fri Jul 17 15:45:25 2026 +0300 bamboo-specs: explicitly checkout the revision; --- bamboo-specs/release.yaml | 6 ++++++ bamboo-specs/test.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index cbb3fc9f5fc..0cc36389d72 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -151,6 +151,12 @@ set -e -f -u -x + # The version.sh script queries the current state of the git + # repository, so we must explicitly checkout the revision that + # triggered the build to prevent race conditions when the master + # branch changes while this build is running. + git checkout "${bamboo_repository_revision_number}" + # Install Qemu, create builder. docker version -f '{{ .Server.Experimental }}' docker buildx rm buildx-builder || : diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index f08688041a8..c61f584bc4d 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -171,6 +171,12 @@ set -e -f -u -x + # The version.sh script queries the current state of the git + # repository, so we must explicitly checkout the revision that + # triggered the build to prevent race conditions when the master + # branch changes while this build is running. + git checkout "${bamboo_repository_revision_number}" + version="$(env CHANNEL=${bamboo_channel} sh ./scripts/make/version.sh)" readonly version