From 508daeae2128cd05c73ec8f07cf1dd5afffc7dbe Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Wed, 27 Sep 2023 10:10:02 +0200 Subject: [PATCH] Update basic github actions --- .github/workflows/backport.yml | 2 +- .github/workflows/integration.yml | 11 ++++++++--- .github/workflows/linux.yml | 25 ++++++++++++++++--------- .github/workflows/macos.yml | 11 ++++++++--- .github/workflows/windows.yml | 11 ++++++++--- 5 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 319380d4a..f3a05ac49 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -7,7 +7,7 @@ on: jobs: backport: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 name: Backport steps: - name: Backport Bot diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 9d4152bc6..bbd1d5f0b 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -6,6 +6,10 @@ on: branches: - main +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: @@ -13,12 +17,13 @@ jobs: steps: - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 - - uses: actions/checkout@v1 + distribution: 'temurin' + - uses: actions/checkout@v4 - name: Maven repository caching - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2/repository key: gwc-integration-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 87b4d7ba8..6e83cc398 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -2,6 +2,10 @@ name: Linux GitHub CI on: [pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + env: MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Djava.awt.headless=true -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS @@ -9,13 +13,14 @@ jobs: openjdk11: runs-on: [ubuntu-20.04] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: 'temurin' - name: Maven repository caching - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2/repository key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -30,13 +35,14 @@ jobs: openjdk17: runs-on: [ubuntu-20.04] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 17 + distribution: 'temurin' - name: Maven repository caching - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2/repository key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -51,13 +57,14 @@ jobs: QA: runs-on: [ubuntu-20.04] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: 'temurin' - name: Maven repository caching - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2/repository key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 48f1352cb..2043e3f59 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,19 +2,24 @@ name: Mac OS CI on: [pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: runs-on: [macos-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: 'temurin' - name: Maven repository caching - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2/repository key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fe62c9dd7..e586d4a01 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,19 +2,24 @@ name: Windows GitHub CI on: [pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: runs-on: [windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: 'temurin' - name: Maven repository caching - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2/repository key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}