libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-16217 Fix compilation errors

Browse source
This commit is contained in:
Hynek Mlnarik 2020-11-10 10:40:06 +01:00 committed by Hynek Mlnařík
parent f6fe88b587
commit 2fd6deaf63
1 changed files with 100 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
.github/workflows/ci.yml vendored
View file

@ -17,13 +17,11 @@ jobs:
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository
!~/.m2/repository/org/keycloak key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: cache-1-${{ runner.os }}-m2
restore-keys: cache-${{ runner.os }}-m2
- name: Build Keycloak - name: Build Keycloak
run: | run: mvn clean install -nsu -B -e -DskipTests -Pquarkus,distribution
mvn clean install -nsu -B -e -DskipTests -Pquarkus,distribution
- name: Store Keycloak artifacts - name: Store Keycloak artifacts
id: store-keycloak id: store-keycloak
@ -35,6 +33,10 @@ jobs:
~/.m2/repository/org/keycloak ~/.m2/repository/org/keycloak
!~/.m2/repository/org/keycloak/**/*.tar.gz !~/.m2/repository/org/keycloak/**/*.tar.gz
- name: Remove keycloak artifacts before caching
if: steps.cache.outputs.cache-hit != 'true'
run: rm -rf ~/.m2/repository/org/keycloak
## Tests: Regular distribution ## Tests: Regular distribution
unit-tests: unit-tests:
@ -50,12 +52,15 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/.m2/repository path: ~/.m2/repository
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: cache-${{ runner.os }}-m2 restore-keys: cache-1-${{ runner.os }}-m2
- name: Cleanup org.keycloak artifacts
run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true
- name: Download built keycloak - name: Download built keycloak
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
- name: Run unit tests - name: Run unit tests
run: | run: |
@ -71,6 +76,7 @@ jobs:
name: reports-unit-tests.zip name: reports-unit-tests.zip
retention-days: 14 retention-days: 14
path: reports-unit-tests.zip path: reports-unit-tests.zip
if-no-files-found: ignore
test: test:
name: Test name: Test
@ -82,25 +88,31 @@ jobs:
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: cache-${{ runner.os }}-m2
- name: Download built keycloak - name: Download built keycloak
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
# - name: List M2 repo
# run: |
# find ~ -name *dist*.zip
# ls -lR ~/.m2/repository
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: Run base tests - name: Run base tests
run: | run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pauth-server-wildfly -DskipTests -f testsuite/pom.xml mvn clean install -nsu -B -Pauth-server-wildfly -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pauth-server-wildfly -f testsuite/integration-arquillian/tests/base/pom.xml | misc/log/trimmer.sh mvn clean install -nsu -B -Pauth-server-wildfly -f testsuite/integration-arquillian/tests/base/pom.xml | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]} TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-base-tests.zip -@ find . -path '*/target/surefire-reports/*.xml' | zip reports-base-tests.zip -@
@ -113,6 +125,7 @@ jobs:
name: reports-base-tests.zip name: reports-base-tests.zip
retention-days: 14 retention-days: 14
path: reports-base-tests.zip path: reports-base-tests.zip
if-no-files-found: ignore
test-cluster: test-cluster:
name: Test Clustering name: Test Clustering
@ -128,17 +141,20 @@ jobs:
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: cache-${{ runner.os }}-m2 - name: Cleanup org.keycloak artifacts
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true
- name: Download built keycloak - name: Download built keycloak
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
@ -161,6 +177,7 @@ jobs:
name: reports-cluster-tests.zip name: reports-cluster-tests.zip
retention-days: 14 retention-days: 14
path: reports-cluster-tests.zip path: reports-cluster-tests.zip
if-no-files-found: ignore
test-crossdc: test-crossdc:
name: Cross-DC Tests name: Cross-DC Tests
@ -185,24 +202,29 @@ jobs:
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: cache-${{ runner.os }}-m2 - name: Cleanup org.keycloak artifacts
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true
- name: Download built keycloak - name: Download built keycloak
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
- name: Run tests - name: Run tests
if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}
shell: bash shell: bash
run: | run: |
echo '::group::Compiling testsuite'
mvn clean install -B -nsu -Pauth-servers-crossdc-jboss,auth-server-wildfly,cache-server-infinispan,app-server-wildfly -DskipTests mvn clean install -B -nsu -Pauth-servers-crossdc-jboss,auth-server-wildfly,cache-server-infinispan,app-server-wildfly -DskipTests
echo '::endgroup::'
mvn clean install -B -nsu -f testsuite/integration-arquillian/tests/base/pom.xml -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly "-Dtest=org.keycloak.testsuite.crossdc.**.*,org.keycloak.testsuite.adapter.**.crossdc.**.*" | misc/log/trimmer.sh mvn clean install -B -nsu -f testsuite/integration-arquillian/tests/base/pom.xml -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly "-Dtest=org.keycloak.testsuite.crossdc.**.*,org.keycloak.testsuite.adapter.**.crossdc.**.*" | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]} TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-cross-dc-tests.zip -@ find . -path '*/target/surefire-reports/*.xml' | zip reports-cross-dc-tests.zip -@
@ -215,6 +237,7 @@ jobs:
name: reports-cross-dc-tests.zip name: reports-cross-dc-tests.zip
retention-days: 14 retention-days: 14
path: reports-cross-dc-tests.zip path: reports-cross-dc-tests.zip
if-no-files-found: ignore
test-undertow-map: test-undertow-map:
name: Test undertow - map provider name: Test undertow - map provider
@ -228,16 +251,18 @@ jobs:
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: cache-${{ runner.os }}-m2 - name: Cleanup org.keycloak artifacts
run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true
- name: Download built keycloak - name: Download built keycloak
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
@ -246,7 +271,9 @@ jobs:
- name: Run base tests - undertow - name: Run base tests - undertow
run: | run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -DskipTests -f testsuite/pom.xml mvn clean install -nsu -B -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -f testsuite/integration-arquillian/tests/base/pom.xml -Dkeycloak.client.provider=map -Dkeycloak.group.provider=map -Dkeycloak.role.provider=map | misc/log/trimmer.sh mvn clean install -nsu -B -f testsuite/integration-arquillian/tests/base/pom.xml -Dkeycloak.client.provider=map -Dkeycloak.group.provider=map -Dkeycloak.role.provider=map | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]} TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-base-undertow-tests.zip -@ find . -path '*/target/surefire-reports/*.xml' | zip reports-base-undertow-tests.zip -@
@ -259,6 +286,7 @@ jobs:
name: reports-base-undertow-tests.zip name: reports-base-undertow-tests.zip
retention-days: 14 retention-days: 14
path: reports-base-undertow-tests.zip path: reports-base-undertow-tests.zip
if-no-files-found: ignore
### Tests: Quarkus distribution ### Tests: Quarkus distribution
@ -274,32 +302,39 @@ jobs:
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: cache-${{ runner.os }}-m2
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: Run Quarkus unit tests - name: Download built keycloak
id: download-keycloak
uses: actions/download-artifact@v2
with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip
- name: Run Quarkus tests
run: | run: |
mvn install -nsu -B -Pquarkus -f quarkus/pom.xml echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest='!org.keycloak.testsuite.adapter.**,!**.crossdc.**,!**.cluster.**' | misc/log/trimmer.sh mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest='!org.keycloak.testsuite.adapter.**,!**.crossdc.**,!**.cluster.**' | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]} TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-base-unit-tests.zip -@ find . -path '*/target/surefire-reports/*.xml' | zip reports-base-unit-tests.zip -@
exit $TEST_RESULT exit $TEST_RESULT
- name: Base / unit test reports - name: Quarkus base / unit test reports
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: failure() if: failure()
with: with:
name: reports-base-unit-tests.zip name: reports-quarkus-base-unit-tests.zip
retention-days: 14 retention-days: 14
path: reports-base-unit-tests.zip path: reports-quarkus-base-unit-tests.zip
if-no-files-found: ignore
quarkus-test-adapter: quarkus-test-adapter:
name: Quarkus Test Adapter name: Quarkus Test Adapter
@ -312,34 +347,39 @@ jobs:
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - name: Cleanup org.keycloak artifacts
restore-keys: cache-${{ runner.os }}-m2 run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true
- name: Download built keycloak - name: Download built keycloak
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: Run adapter tests - name: Run Quarkus adapter tests
run: | run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest=org.keycloak.testsuite.adapter.** | misc/log/trimmer.sh mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -f testsuite/integration-arquillian/tests/base/pom.xml -Dtest=org.keycloak.testsuite.adapter.** | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]} TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-adapter-tests.zip -@ find . -path '*/target/surefire-reports/*.xml' | zip reports-adapter-tests.zip -@
exit $TEST_RESULT exit $TEST_RESULT
- name: Adapter test reports - name: Quarkus adapter test reports
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: failure() if: failure()
with: with:
name: reports-adapter-tests.zip name: reports-quarkus-adapter-tests.zip
retention-days: 14 retention-days: 14
path: reports-adapter-tests.zip path: reports-quarkus-adapter-tests.zip
if-no-files-found: ignore
quarkus-test-cluster: quarkus-test-cluster:
name: Quarkus Test Clustering name: Quarkus Test Clustering
@ -352,31 +392,36 @@ jobs:
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: ~/.m2/repository
~/.m2/repository key: cache-1-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
!~/.m2/repository/org/keycloak restore-keys: cache-1-${{ runner.os }}-m2
key: cache-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - name: Cleanup org.keycloak artifacts
restore-keys: cache-${{ runner.os }}-m2 run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true
- name: Download built keycloak - name: Download built keycloak
id: download-keycloak id: download-keycloak
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
path: ~/.m2/repository/org/keycloak/
name: keycloak-artifacts.zip name: keycloak-artifacts.zip
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: Run cluster tests - name: Run Quarkus cluster tests
run: | run: |
echo '::group::Compiling testsuite'
mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml mvn clean install -nsu -B -Pquarkus,auth-server-quarkus -DskipTests -f testsuite/pom.xml
echo '::endgroup::'
mvn clean install -nsu -B -Pauth-server-cluster-quarkus -Dsession.cache.owners=2 -Dtest=**.cluster.** -f testsuite/integration-arquillian/pom.xml | misc/log/trimmer.sh mvn clean install -nsu -B -Pauth-server-cluster-quarkus -Dsession.cache.owners=2 -Dtest=**.cluster.** -f testsuite/integration-arquillian/pom.xml | misc/log/trimmer.sh
TEST_RESULT=${PIPESTATUS[0]} TEST_RESULT=${PIPESTATUS[0]}
find . -path '*/target/surefire-reports/*.xml' | zip reports-cluster-tests.zip -@ find . -path '*/target/surefire-reports/*.xml' | zip reports-cluster-tests.zip -@
exit $TEST_RESULT exit $TEST_RESULT
- name: Cluster test reports - name: Quarkus cluster test reports
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: failure() if: failure()
with: with:
name: reports-cluster-tests.zip name: reports-quarkus-cluster-tests.zip
retention-days: 14 retention-days: 14
path: reports-cluster-tests.zip path: reports-quarkus-cluster-tests.zip
if-no-files-found: ignore