diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index c3bdf8de440a..661d045fbf80 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -12,10 +12,10 @@ env: on: push: - branches: [ master ] + branches: [ 6.5.x ] pull_request: types: [ labeled ] - branches: [ master ] + branches: [ 6.5.x ] ########################################################################## @@ -120,11 +120,11 @@ jobs: strategy: matrix: category: - - spotbugsMain - - spotbugsTest + # - spotbugsMain + # - spotbugsTest - checkstyleMain - checkstyleTest - - checkLicense + # - checkLicense name: ${{ matrix.category }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 607dd99e7e6d..2d7adc30eb4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ env: on: push: - branches: [ master ] + branches: [ 6.5.x ] pull_request: types: [ labeled ] - branches: [ master ] + branches: [ 6.5.x ] ########################################################################## @@ -91,7 +91,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -128,31 +128,31 @@ jobs: ########################################################################## - build-latest-jdk: - runs-on: ubuntu-latest - needs: [cache] - continue-on-error: false - steps: - - uses: actions/checkout@v2 - - name: Set up JDK - uses: actions/setup-java@v2 - with: - java-version: ${{ env.JDK_LATEST }} - distribution: 'temurin' - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 - 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 - - name: Initialize - run: chmod -R 777 ./ci/*.sh && ./ci/init-build.sh - - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - 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 + # build-latest-jdk: + # runs-on: ubuntu-latest + # needs: [cache] + # continue-on-error: false + # steps: + # - uses: actions/checkout@v2 + # - name: Set up JDK + # uses: actions/setup-java@v2 + # with: + # java-version: ${{ env.JDK_LATEST }} + # distribution: 'temurin' + # - name: Setup Gradle Wrapper Cache + # uses: actions/cache@v2 + # 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 + # - name: Initialize + # run: chmod -R 777 ./ci/*.sh && ./ci/init-build.sh + # - uses: actions/cache@v2 + # with: + # path: ~/.gradle/caches + # key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + # 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 diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index f888c9cdf902..1329ac278cd1 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -12,19 +12,8 @@ env: on: push: - branches: - - master - - '!**.**.**' - pull_request: - types: [ labeled ] - branches: - - master - - '!**.**.**' - schedule: - # * is a special character in YAML; must quote this string - # https://crontab.guru - # At 08:00 on Friday - - cron: '0 8 * * 5' + branches-ignore: + - '**' ########################################################################## jobs: diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 1fd3482f1cce..108a285450f4 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -12,18 +12,9 @@ env: ########################################################################## on: - schedule: - - cron: "0 0 * * 5" -#on: -# push: -# branches: -# - master -# - '!**.**.**' -# pull_request: -# types: [ labeled ] -# branches: -# - master -# - '!**.**.**' + push: + branches-ignore: + - '**' ########################################################################## diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 8fb327f53939..530f270915c1 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -9,16 +9,16 @@ env: GRADLE_BUILDCACHE_PSW: ${{ secrets.GRADLE_BUILDCACHE_PSW }} RUBY_VERSION: 3.0.2 JDK_CURRENT: 11 - DOCS_BRANCH: master + DOCS_BRANCH: 6.5.x ########################################################################## on: push: - branches: [ master ] + branches: [ 6.5.x ] pull_request: types: [ labeled ] - branches: [ master ] + branches: [ 6.5.x ] ########################################################################## diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 078628906a78..80648fb0e1d9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,10 +14,10 @@ env: on: push: - branches: [ master ] + branches: [ 6.5.x ] pull_request: types: [ labeled ] - branches: [ master ] + branches: [ 6.5.x ] ########################################################################## diff --git a/.github/workflows/puppeteer.yml b/.github/workflows/puppeteer.yml index ce005edd62af..9c219a086934 100644 --- a/.github/workflows/puppeteer.yml +++ b/.github/workflows/puppeteer.yml @@ -24,13 +24,13 @@ env: on: push: branches: - - master + - 6.5.x - '!**.**.**' - 'pr-*' pull_request: types: [ labeled ] branches: - - master + - 6.5.x - '!**.**.**' ########################################################################## diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 40d259c5a007..aac11d2f506a 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -14,17 +14,9 @@ env: ########################################################################## on: - schedule: - - cron: "0 0 * * 5" -# push: -# branches: -# - master -# - '!**.**.**' -# pull_request: -# types: [ labeled ] -# branches: -# - master -# - '!**.**.**' + push: + branches-ignore: + - '**' ########################################################################## diff --git a/.github/workflows/test-oidc-conformance.yml b/.github/workflows/test-oidc-conformance.yml index 6c65609da6b9..6d583a5a492e 100644 --- a/.github/workflows/test-oidc-conformance.yml +++ b/.github/workflows/test-oidc-conformance.yml @@ -12,14 +12,8 @@ env: on: push: - branches: - - master - - '!**.**.**' - pull_request: - types: [ labeled ] - branches: - - master - - '!**.**.**' + branches-ignore: + - '**' ########################################################################## diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index cfb3b2748da7..861bc864b893 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -11,19 +11,10 @@ env: JDK_CURRENT: 11 CATEGORY_REGEX: ".*" # Use this to limit which tests run ########################################################################## - on: - schedule: - - cron: "0 0 * * 5" -# push: -# branches: -# - master -# - '!**.**.**' -# pull_request: -# types: [ labeled ] -# branches: -# - master -# - '!**.**.**' + push: + branches-ignore: + - '**' ########################################################################## diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index e93741fbb90a..d16dc4b72235 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -12,10 +12,10 @@ env: on: push: - branches: [ master ] + branches: [ 6.5.x ] pull_request: types: [ labeled ] - branches: [ master ] + branches: [ 6.5.x ] ########################################################################## diff --git a/docs/cas-server-documentation/developer/Release-Process.md b/docs/cas-server-documentation/developer/Release-Process.md index 8f3e2b160176..7ce58b82fef6 100644 --- a/docs/cas-server-documentation/developer/Release-Process.md +++ b/docs/cas-server-documentation/developer/Release-Process.md @@ -79,7 +79,7 @@ skip this step and move on to next section to build and release.

releases, when new branches are created.

Change GitHub Actions workflows to trigger and *only* build the newly-created release branch: -* + * Modify the `analysis.yml` workflow to run on the newly-created branch. Disable `spotBugsMain`, `spotBugsTest` and `checkLicense` tasks. * Modify the `validation.yml` workflow to run on the newly-created branch. * Modify the `build.yml` workflow to run on the newly-created branch, and only on Ubuntu. Disable the job to skip building on the latest JDK. diff --git a/gradle.properties b/gradle.properties index b85319e8d2cb..e1b922cd4c6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ # Platform metadata for releases, POM generation, etc. ################################################# group=org.apereo.cas -version=6.5.0-SNAPSHOT +version=6.5.0 projectUrl=https://www.apereo.org/cas projectInceptionYear=2004 projectScmUrl=scm:git@github.com:apereo/cas.git