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

[WFLY-18689] adds matrix.jdk customization, fixes add-users feature #767

Merged
merged 1 commit into from
Oct 26, 2023
Merged

[WFLY-18689] adds matrix.jdk customization, fixes add-users feature #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions .github/workflows/quickstart_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ on:
required: false
default: true
type: boolean
MATRIX_JDK:
description: 'the JDKs to be used on the test matrix, i.e. matrix.jdk'
required: false
default: '"11", "17"'
type: string
MATRIX_OS:
description: 'the OSes to be used on the test matrix, i.e. matrix.os'
required: false
Expand All @@ -42,9 +47,12 @@ jobs:
Matrix-Setup:
runs-on: ubuntu-latest
outputs:
os: ${{ steps.setup-os-matrix.outputs.os }}
os: ${{ steps.setup-matrix-os.outputs.os }}
jdk: ${{ steps.setup-matrix-jdk.outputs.jdk }}
steps:
- id: setup-os-matrix
- id: setup-matrix-jdk
run: echo 'jdk=[${{ inputs.MATRIX_JDK }}]' >> $GITHUB_OUTPUT
- id: setup-matrix-os
run: echo 'os=[${{ inputs.MATRIX_OS }}]' >> $GITHUB_OUTPUT

Test-build-default-matrix:
Expand All @@ -54,7 +62,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [11, 17]
jdk: ${{ fromJSON(needs.Matrix-Setup.outputs.jdk) }}
os: ${{ fromJSON(needs.Matrix-Setup.outputs.os) }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -152,7 +160,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [11, 17]
jdk: ${{ fromJSON(needs.Matrix-Setup.outputs.jdk) }}
os: ${{ fromJSON(needs.Matrix-Setup.outputs.os) }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -194,6 +202,10 @@ jobs:
cd ${{ inputs.QUICKSTART_PATH }}
echo "Building provisioned server..."
mvn -U -B -fae clean package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
echo "Add quickstartUser..."
target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
echo "Add quickstartAdmin..."
target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
echo "Starting provisioned server..."
mvn -U -B -fae wildfly:start -DjbossHome=target/server -Dstartup-timeout=120
echo "Testing provisioned server..."
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/quickstart_spring-resteasy_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ jobs:
with:
QUICKSTART_PATH: spring-resteasy
TEST_PROVISIONED_SERVER: true
MATRIX_JDK: '"17"'