Skip to content

Commit

Permalink
Merge branch 'master' of github.com:apereo/cas
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
mmoayyed committed May 19, 2023
2 parents 5d05f7f + 896f5dc commit 2487cf8
Show file tree
Hide file tree
Showing 1,705 changed files with 16,147 additions and 18,360 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand All @@ -68,7 +68,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand Down
59 changes: 28 additions & 31 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@ name: Build
env:
JAVA_OPTS: "-Xms512m -Xmx6048m -Xss128m -XX:ReservedCodeCacheSize=512m -server -XX:+UseG1GC"
GRADLE_OPTS: "-Xms512m -Xmx6048m -Xss128m -XX:ReservedCodeCacheSize=512m -server -XX:+UseG1GC"
GRADLE_BUILD_OPTIONS: "--no-daemon -x check -x test -x javadoc --configure-on-demand --max-workers=8 --no-configuration-cache"
TERM: xterm-256color
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GRADLE_BUILDCACHE_USER: ci
GRADLE_BUILDCACHE_PSW: ${{ secrets.GRADLE_BUILDCACHE_PSW }}
GH_PACKAGE_REGISTRY_USER: ${{ secrets.GH_PACKAGE_REGISTRY_USER }}
GH_PACKAGE_REGISTRY_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
JDK_CURRENT: 17
JDK_LATEST: 20-ea
JDK_LATEST: 21-ea

##########################################################################

on:
schedule:
- cron: "0 0 * * 5"

#on:
- cron: '0 0 * * *'
# push:
# branches: [ master ]
# pull_request:
Expand All @@ -29,19 +28,17 @@ on:

jobs:
cancel-previous-runs:
if: ${{ (github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI')) && !contains(github.event.head_commit.message, 'trigger dependency update') && !contains(github.event.head_commit.message, 'documentation update') && !contains(github.event.head_commit.message, 'ci:minimal') }}
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

##########################################################################
##########################################################################

initialize:
runs-on: ubuntu-latest
needs: [cancel-previous-runs]
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand All @@ -53,13 +50,13 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
run: ls ./ci && chmod -R +x ./ci/**/*.sh && ./ci/init-build.sh

##########################################################################
##########################################################################

cache:
runs-on: ubuntu-latest
Expand All @@ -75,22 +72,22 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
run: chmod -R +x ./ci/**/*.sh && ./ci/init-build.sh
- uses: actions/checkout@v3
- name: Download Dependencies
run: ./gradlew --build-cache --configure-on-demand --no-daemon downloadDependencies --parallel --refresh-dependencies --max-workers=8
run: ./gradlew downloadDependencies ${{ env.GRADLE_BUILD_OPTIONS }}
- uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
##########################################################################
##########################################################################

build:
needs: [cache]
Expand All @@ -102,8 +99,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
Expand All @@ -113,9 +110,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
run: chmod -R +x ./ci/**/*.sh && ./ci/init-build.sh
shell: bash
Expand All @@ -126,14 +123,14 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew --build-cache --no-watch-fs --configure-on-demand --no-daemon build -x test -x javadoc -x check --parallel --max-workers=8
run: ./gradlew build ${{ env.GRADLE_BUILD_OPTIONS }}
- uses: actions/upload-artifact@v3
if: ${{ matrix.os == 'ubuntu-latest' }}
with:
name: binary-artifacts
path: ./**/build/libs/*.*

##########################################################################
##########################################################################

build-latest-jdk:
runs-on: ubuntu-latest
Expand All @@ -145,14 +142,14 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: ${{ env.JDK_LATEST }}
distribution: 'temurin'
distribution: 'zulu'
- name: Setup Gradle Wrapper Cache
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
run: chmod -R +x ./ci/**/*.sh && ./ci/init-build.sh
- uses: actions/cache@v3
Expand All @@ -162,7 +159,7 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew --build-cache --no-watch-fs --configure-on-demand --no-daemon build -x test -x javadoc -x check --parallel --max-workers=8
run: ./gradlew build ${{ env.GRADLE_BUILD_OPTIONS }}

##########################################################################

Expand Down Expand Up @@ -192,7 +189,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand All @@ -204,4 +201,4 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew --build-cache --no-watch-fs --configure-on-demand --no-daemon build -x test -x javadoc -x check --parallel --max-workers=8
run: ./gradlew build ${{ env.GRADLE_BUILD_OPTIONS }}
8 changes: 4 additions & 4 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand All @@ -68,7 +68,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand All @@ -112,4 +112,4 @@ jobs:
${{ runner.os }}-gradle-
- name: Report Dependency Updates
run: |
./gradlew --build-cache --configure-on-demand --no-daemon --parallel -x test -x javadoc dependencyUpdates -Drevision=release -DskipNestedConfigMetadataGen=true -DgradleReleaseChannel=current --max-workers=8
./gradlew --build-cache --configure-on-demand --no-daemon --parallel -x test -x javadoc dependencyUpdates --no-configuration-cache -Drevision=release -DskipNestedConfigMetadataGen=true -DgradleReleaseChannel=current --max-workers=8
13 changes: 6 additions & 7 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
GRADLE_BUILDCACHE_PSW: ${{ secrets.GRADLE_BUILDCACHE_PSW }}
GH_PACKAGE_REGISTRY_USER: ${{ secrets.GH_PACKAGE_REGISTRY_USER }}
GH_PACKAGE_REGISTRY_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
PYTHON_VERSION: 3.10.2
PYTHON_VERSION: 3.11
JDK_CURRENT: 17

##########################################################################
Expand All @@ -32,7 +32,6 @@ on:

jobs:
cancel-previous-runs:
if: ${{ (github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI')) && !contains(github.event.head_commit.message, 'trigger dependency update') && !contains(github.event.head_commit.message, 'documentation update') && !contains(github.event.head_commit.message, 'ci:minimal') }}
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
Expand All @@ -54,7 +53,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand All @@ -75,7 +74,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand Down Expand Up @@ -109,14 +108,14 @@ jobs:
with:
java-version: ${{ env.JDK_CURRENT }}
distribution: 'temurin'
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Setup Gradle Wrapper Cache
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- name: Initialize
Expand Down Expand Up @@ -157,7 +156,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-${{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# - name: Gradle Wrapper Validation
# uses: gradle/wrapper-validation-action@v1
- uses: actions/cache@v3
Expand Down
Loading

0 comments on commit 2487cf8

Please sign in to comment.