Merge pull request #50 from Conjur-Enterprise/fix-promote

CNJR-8508: Fix git permissions for promotion

Author: gl-johnson

CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Nothing should go in this section, please add to the latest unreleased version
   (and update the corresponding date), or add a new version.
 
-## [1.7.28] - 2025-03-21
+## [1.7.28] - 2025-04-01
 
 ### Changed
 - Upgrade Go to 1.24.x
@@ -757,7 +757,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - The first tagged version.
 
-[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.7.26...HEAD
+[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.7.28...HEAD
 [0.2.0]: https://github.com/cyberark/secretless-broker/compare/v0.1.0...v0.2.0
 [0.3.0]: https://github.com/cyberark/secretless-broker/compare/v0.2.0...v0.3.0
 [0.4.0]: https://github.com/cyberark/secretless-broker/compare/v0.3.0...v0.4.0
@@ -809,3 +809,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [1.7.24]: https://github.com/cyberark/secretless-broker/compare/v1.7.23...v1.7.24
 [1.7.25]: https://github.com/cyberark/secretless-broker/compare/v1.7.24...v1.7.25
 [1.7.26]: https://github.com/cyberark/secretless-broker/compare/v1.7.25...v1.7.26
+[1.7.27]: https://github.com/cyberark/secretless-broker/compare/v1.7.26...v1.7.27
+[1.7.28]: https://github.com/cyberark/secretless-broker/compare/v1.7.27...v1.7.28

Jenkinsfile

@@ -66,6 +66,10 @@ if (params.MODE == "PROMOTE") {
       #Promote source version to target version.
       summon -e common ./bin/publish --promote --source ${sourceVersion} --target ${targetVersion}
     """
+
+    // Ensure the working directory is a safe git directory for the subsequent
+    // promotion operations after this block.
+    sh 'git config --global --add safe.directory "$(pwd)"'
   }
 
   // Copy Github Enterprise release to Github

bin/check_golang_security

@@ -42,6 +42,7 @@ else
   # /home/jenkins/agent/workspace/secretless-broker-main-full_main/third_party/go-mssqldb
   # /home/jenkins/agent/workspace/secretless-broker-main-full_main/secretless-broker-main-full_main/third_party/go-mssqldb
   # To accomodate the second case, we duplicate the name of the working directory to build the full path
+  # Note this still doesn't work even though we exclude both paths.
   third_party_import_dir="$(pwd)/$(basename "$(pwd)")/third_party/go-mssqldb"
   excluded_directories="$(pwd)/test,$(pwd)/third_party/go-mssqldb,$third_party_import_dir"
   echo "Excluding directories: ${excluded_directories}"

bin/run_gosec

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eo pipefail
+set -exo pipefail
 
 # This script can run independently of secretless
 # i.e. in any given local repository