CNJR-0000 Merge pull request #6 from Conjur-Enterprise/update-collect…

…ion-version Automate Version Management for Ansible Collection
cyberark · Oct 30, 2024 · 37801ff · 37801ff
2 parents 7c02ff5 + 5971e79
commit 37801ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ci/build_release b/ci/build_release
@@ -2,12 +2,18 @@
 
 set -euo pipefail
 
+REPO="$(git rev-parse --show-toplevel)"
+export COLLECTION_VERSION="$(cat "$REPO/VERSION" | cut -d'-' -f1)"
 TOP_LEVEL_DIR="$(cd "$(dirname "$BASH_SOURCE")"; pwd)/.."
 
 pushd "$TOP_LEVEL_DIR" >/dev/null
   docker run --rm -t \
     -v "$TOP_LEVEL_DIR:/collection" \
     python:3 /bin/bash -c "
+      # Verify and replace the version in the galaxy.yml file
+      if [[ -n \"$COLLECTION_VERSION\" ]] && ! grep -q \"version: '$COLLECTION_VERSION'\" /collection/galaxy.yml; then
+        sed -i 's/version: \".*\"/version: \"$COLLECTION_VERSION\"/' /collection/galaxy.yml
+      fi
       pip install ansible
       ansible-galaxy collection build --force --output /collection/. /collection
     "

diff --git a/ci/publish_to_galaxy b/ci/publish_to_galaxy
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Strip the 'v' from the Tag Name
-TAG=${TAG_NAME//"v"}
+TAG=${TAG//"v"}
 
 TOP_LEVEL_DIR="$(cd "$(dirname "$BASH_SOURCE")"; pwd)/.."