diff --git a/app/src/main/resources/common/.github/workflows/build.yml.mustache b/app/src/main/resources/common/.github/workflows/build.yml.mustache index 1753255b..99acd425 100644 --- a/app/src/main/resources/common/.github/workflows/build.yml.mustache +++ b/app/src/main/resources/common/.github/workflows/build.yml.mustache @@ -4,7 +4,6 @@ env: JAVA_OPTS: "-Xms512m -Xmx6048m -Xss128m -XX:ReservedCodeCacheSize=512m -XX:+UseG1GC" GRADLE_OPTS: "-Xms512m -Xmx6048m -Xss128m -XX:ReservedCodeCacheSize=512m -XX:+UseG1GC" TERM: xterm-256color - JDK_CURRENT: <%javaVersion%> on: push: @@ -12,28 +11,25 @@ on: pull_request: branches: [ <%branch%> ] +concurrency: + group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}" + cancel-in-progress: ${{ github.event_name == 'push' }} + jobs: - cancel-previous-runs: - runs-on: ubuntu-latest - timeout-minutes: 1 - steps: - - uses: styfle/cancel-workflow-action@0.12.0 - with: - access_token: ${{ github.token }} build: - needs: cancel-previous-runs strategy: fail-fast: false matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] + jdk: [ <%javaVersion%> ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4.0.0 + - name: Set up JDK ${{ matrix.jdk }} + uses: actions/setup-java@v4 with: - java-version: ${{ env.JDK_CURRENT }} + java-version: ${{ matrix.jdk }} distribution: 'corretto' - - name: Build + - name: Build with ${{ matrix.jdk }} on ${{ matrix.os }} run: ./gradlew clean build <%={{ }}=%> diff --git a/ci/sync-overlay.sh b/ci/sync-overlay.sh index c7a83b1a..c062045e 100755 --- a/ci/sync-overlay.sh +++ b/ci/sync-overlay.sh @@ -44,8 +44,8 @@ git status echo "Updating project README" warning="# IMPORTANT NOTE<br/>" warning="${warning}******************************************************<br/>" -warning="${warning}This repository is always automatically generated from the CAS Initializr. " -warning="${warning}Do NOT submit pull requests here as the change-set will be overwritten on the next sync." +warning="${warning}This repository is always automatically generated from the [CAS Initializr](https://github.com/apereo/cas-initializr). " +warning="${warning}Do NOT submit pull requests here as the change-set will be overwritten on the next sync. " warning="${warning}To learn more, please visit the [CAS documentation](https://apereo.github.io/cas)." warning="${warning}<br/>******************************************************<br/>" text=$(echo "${warning}"; cat README.md)