Merge pull request #199 from hpidcock/fix-package-juju-source

fix: package-juju-source on 4.0 needs to look in core/
juju · Jul 24, 2024 · d01e328 · d01e328
2 parents 0548279 + e5b903f
commit d01e328
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/jobs/ci-run/scripts/package-juju-source.sh b/jobs/ci-run/scripts/package-juju-source.sh
@@ -76,7 +76,11 @@ fi
 
 PROPS_PATH=${WORKSPACE}/build.properties
 #  Need to prepare some variables used through out the process
-JUJU_VERSION=$(sed -n 's/^const version = "\(.*\)"/\1/p' ${full_path}/version/version.go)
+VERSION_FILE="${full_path}/version/version.go"
+if [ -f "${full_path}/core/version/version.go" ]; then
+VERSION_FILE="${full_path}/core/version/version.go"
+fi
+JUJU_VERSION=$(sed -n 's/^const version = "\(.*\)"/\1/p' "${VERSION_FILE}")
 if [[ -n ${JUJU_BUILD_NUMBER:-} ]]; then
     JUJU_VERSION="${JUJU_VERSION}.${JUJU_BUILD_NUMBER}"
 fi