Skip to content

Commit b6688d5

Browse files
authored
Merge pull request #18 from jpicklyk/fix/workflow-version-validation
fix: update version validation to handle qualifiers in GitHub workflow
2 parents 48a3db2 + 668ac8d commit b6688d5

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.github/workflows/docker-publish.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,25 @@ jobs:
2525
- name: Validate version consistency
2626
if: github.ref_type == 'tag'
2727
run: |
28-
# Extract version from build.gradle.kts
29-
GRADLE_VERSION=$(grep -E '^val (majorVersion|minorVersion|patchVersion)' build.gradle.kts | \
30-
sed 's/.*= "\(.*\)"/\1/' | paste -sd '.' -)
31-
28+
# Extract version components from build.gradle.kts
29+
MAJOR=$(grep '^val majorVersion' build.gradle.kts | sed 's/.*= "\(.*\)"/\1/')
30+
MINOR=$(grep '^val minorVersion' build.gradle.kts | sed 's/.*= "\(.*\)"/\1/')
31+
PATCH=$(grep '^val patchVersion' build.gradle.kts | sed 's/.*= "\(.*\)"/\1/')
32+
QUALIFIER=$(grep '^val qualifier' build.gradle.kts | sed 's/.*= "\(.*\)"/\1/')
33+
34+
# Build gradle version with qualifier if present
35+
if [ -z "$QUALIFIER" ]; then
36+
GRADLE_VERSION="${MAJOR}.${MINOR}.${PATCH}"
37+
else
38+
GRADLE_VERSION="${MAJOR}.${MINOR}.${PATCH}-${QUALIFIER}"
39+
fi
40+
3241
# Extract tag version (remove 'v' prefix)
3342
TAG_VERSION=${GITHUB_REF_NAME#v}
34-
43+
3544
echo "Gradle version: $GRADLE_VERSION"
3645
echo "Git tag version: $TAG_VERSION"
37-
46+
3847
if [ "$GRADLE_VERSION" != "$TAG_VERSION" ]; then
3948
echo "ERROR: Version mismatch! Gradle version ($GRADLE_VERSION) does not match git tag ($TAG_VERSION)"
4049
exit 1

0 commit comments

Comments
 (0)