Skip to content

Commit

Permalink
Merge branch 'master' of github.com:apereo/cas
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed committed Nov 18, 2022
2 parents 3d85259 + 8b35548 commit 3a80225
Show file tree
Hide file tree
Showing 826 changed files with 13,676 additions and 2,970 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
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') }}
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -43,7 +43,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -65,7 +65,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -137,7 +137,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -192,7 +192,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -46,7 +46,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 }}-gradle-wrapper-${{ 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 @@ -106,7 +106,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -143,7 +143,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -185,7 +185,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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
8 changes: 4 additions & 4 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -43,7 +43,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -65,7 +65,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -96,7 +96,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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
10 changes: 5 additions & 5 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -51,7 +51,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -72,7 +72,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -113,7 +113,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -154,7 +154,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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
8 changes: 4 additions & 4 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -48,7 +48,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -70,7 +70,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -103,7 +103,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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
16 changes: 8 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -47,7 +47,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -69,9 +69,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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
Expand Down Expand Up @@ -102,9 +102,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 Down
20 changes: 10 additions & 10 deletions .github/workflows/puppeteer-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
TERM: xterm-256color
JDK_CURRENT: 17
NODE_CURRENT: '16'
NODE_CURRENT: '19'
SCENARIO_REGEX: ".*" # Use this to limit which tests run
JDK_JAVA_OPTIONS: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true"

Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: macos-latest
timeout-minutes: 1
steps:
- uses: styfle/cancel-workflow-action@0.10.1
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

Expand All @@ -69,7 +69,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ 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 @@ -96,7 +96,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
- name: Configure Gradle Timeouts
run: |
echo systemProp.org.gradle.internal.http.connectionTimeout=60000 >> gradle.properties
Expand All @@ -120,9 +120,9 @@ jobs:
- id: print-scenarios
run: ./gradlew --build-cache --configure-on-demand --no-daemon -q puppeteerScenarios | jq
- id: get-scenarios255
run: echo "::set-output name=scenarios255::$(./gradlew --build-cache --configure-on-demand --no-daemon -q puppeteerScenarios -PpuppeteerScenariosFrom=0 -PpuppeteerScenariosTo=255)]}"
run: echo "scenarios255=$(./gradlew --build-cache --configure-on-demand --no-daemon -q puppeteerScenarios -PpuppeteerScenariosFrom=0 -PpuppeteerScenariosTo=255)" >> $GITHUB_OUTPUT
- id: get-scenarios511
run: echo "::set-output name=scenarios511::$(./gradlew --build-cache --configure-on-demand --no-daemon -q puppeteerScenarios -PpuppeteerScenariosFrom=255 -PpuppeteerScenariosTo=511)]}"
run: echo "scenarios511=$(./gradlew --build-cache --configure-on-demand --no-daemon -q puppeteerScenarios -PpuppeteerScenariosFrom=255 -PpuppeteerScenariosTo=511)" >> $GITHUB_OUTPUT

##########################################################################
puppeteer-tests-255:
Expand Down Expand Up @@ -151,9 +151,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
- name: Set up Nodejs
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_CURRENT }}
cache: 'npm'
Expand Down Expand Up @@ -201,9 +201,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-{{ github.sha }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
- name: Set up Nodejs
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_CURRENT }}
cache: 'npm'
Expand Down
Loading

0 comments on commit 3a80225

Please sign in to comment.