Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Use correct SNAPSHOT version for Quarkus release branches #673

Merged
merged 2 commits into from
Jan 26, 2024
Merged

[CI] Use correct SNAPSHOT version for Quarkus release branches #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e347783
Use correct SNAPSHOT version for Quarkus release branches
zakkak Jan 24, 2024
e9d51eb
DONT MERGE ME: TEST BRANCH
zakkak Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/base-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,8 @@ jobs:
# Don't use SNAPSHOT version for 2.2 and release tags
if ("${{ inputs.quarkus-version }}" -eq "2.2") {
$QUARKUS_VERSION="2.2.999"
} elseif (${{ inputs.quarkus-version }} -match "^[0-9]+\.[0-9]+$") {
$QUARKUS_VERSION="${{ inputs.quarkus-version }}.999-SNAPSHOT"
} elseif (! ($QUARKUS_VERSION -match "^.*\.(Final|CR|Alpha|Beta)[0-9]?$")) {
$QUARKUS_VERSION="999-SNAPSHOT"
}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,10 @@ jobs:
if [ "${{ inputs.quarkus-version }}" == "2.2" ]
then
export QUARKUS_VERSION=2.2.999
elif $(expr match "${{ inputs.quarkus-version }}" "^[0-9]\+\.[0-9]\+$" > /dev/null)
then
# release branches use the branch name followed by .999-SNAPSHOT as the version
export QUARKUS_VERSION="${{ inputs.quarkus-version }}.999-SNAPSHOT"
elif ! $(expr match "$QUARKUS_VERSION" "^.*\.\(Final\|CR\|Alpha\|Beta\)[0-9]\?$" > /dev/null)
then
export QUARKUS_VERSION="999-SNAPSHOT"
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
####
q-main-mandrel-23_0:
name: "Q main M 23.0 JDK 17"
uses: graalvm/mandrel/.github/workflows/base.yml@default
uses: zakkak/mandrel/.github/workflows/base.yml@2024-01-24-fix-quarkus-snapshots
with:
quarkus-version: "main"
build-type: "mandrel-source-nolocalmvn"
Expand All @@ -125,7 +125,7 @@ jobs:
####
q-3_2-mandrel-23_0:
name: "Q 3.2 M 23.0 JDK 17"
uses: graalvm/mandrel/.github/workflows/base.yml@default
uses: zakkak/mandrel/.github/workflows/base.yml@2024-01-24-fix-quarkus-snapshots
with:
quarkus-version: "3.2"
build-type: "mandrel-source-nolocalmvn"
Expand All @@ -136,10 +136,9 @@ jobs:
# Test Quarkus 2.13 with Mandrel 22.3 JDK 17 ####
q-2_13-mandrel-22_3:
name: "Q 2.13 M 22.3 image"
uses: graalvm/mandrel/.github/workflows/base.yml@default
uses: zakkak/mandrel/.github/workflows/base.yml@2024-01-24-fix-quarkus-snapshots
with:
# Use a tag for 2.13 due to https://github.com/graalvm/mandrel/issues/501
quarkus-version: "2.13.8.Final"
quarkus-version: "2.13"
build-type: "mandrel-source-nolocalmvn"
version: "mandrel/22.3"
jdk: "17/ea"
Expand Down
Loading