Skip to content

Commit

Permalink
prep work for 6.5.x release
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed committed Feb 14, 2022
1 parent 6c9b7df commit e1e6e65
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 103 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ env:

on:
push:
branches: [ master ]
branches: [ 6.5.x ]
pull_request:
types: [ labeled ]
branches: [ master ]
branches: [ 6.5.x ]

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

Expand Down Expand Up @@ -120,11 +120,11 @@ jobs:
strategy:
matrix:
category:
- spotbugsMain
- spotbugsTest
# - spotbugsMain
# - spotbugsTest
- checkstyleMain
- checkstyleTest
- checkLicense
# - checkLicense
name: ${{ matrix.category }}
steps:
- uses: actions/checkout@v2
Expand Down
62 changes: 31 additions & 31 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ env:

on:
push:
branches: [ master ]
branches: [ 6.5.x ]
pull_request:
types: [ labeled ]
branches: [ master ]
branches: [ 6.5.x ]

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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
15 changes: 2 additions & 13 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,9 @@ env:
##########################################################################

on:
schedule:
- cron: "0 0 * * 5"
#on:
# push:
# branches:
# - master
# - '!**.**.**'
# pull_request:
# types: [ labeled ]
# branches:
# - master
# - '!**.**.**'
push:
branches-ignore:
- '**'

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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ env:

on:
push:
branches: [ master ]
branches: [ 6.5.x ]
pull_request:
types: [ labeled ]
branches: [ master ]
branches: [ 6.5.x ]

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/puppeteer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ env:
on:
push:
branches:
- master
- 6.5.x
- '!**.**.**'
- 'pr-*'
pull_request:
types: [ labeled ]
branches:
- master
- 6.5.x
- '!**.**.**'

##########################################################################
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,9 @@ env:
##########################################################################

on:
schedule:
- cron: "0 0 * * 5"
# push:
# branches:
# - master
# - '!**.**.**'
# pull_request:
# types: [ labeled ]
# branches:
# - master
# - '!**.**.**'
push:
branches-ignore:
- '**'

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

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/test-oidc-conformance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,8 @@ env:

on:
push:
branches:
- master
- '!**.**.**'
pull_request:
types: [ labeled ]
branches:
- master
- '!**.**.**'
branches-ignore:
- '**'

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

Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- '**'

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ env:

on:
push:
branches: [ master ]
branches: [ 6.5.x ]
pull_request:
types: [ labeled ]
branches: [ master ]
branches: [ 6.5.x ]

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

Expand Down
2 changes: 1 addition & 1 deletion docs/cas-server-documentation/developer/Release-Process.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ skip this step and move on to next section to build and release.</p></div>
releases, when new branches are created.</p></div>

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.
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1e6e65

Please sign in to comment.