Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Ubuntu, Java and GitHub Actions versions #39

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Upgrade Ubuntu, Java and GitHub Actions versions #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 34 additions & 28 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ on:
jobs:
package:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: temurin

- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
Expand All @@ -38,23 +39,24 @@ jobs:
unit-tests:
needs: package

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: temurin

- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache Maven package
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
Expand All @@ -66,19 +68,21 @@ jobs:
integration-tests:
needs: package

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
# Crowd and thus the integration tests are not compatible with Java 17
java-version: 11
distribution: temurin

- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache Maven package
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
Expand All @@ -92,7 +96,7 @@ jobs:

if: github.event_name == 'push' # to 'main'

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

env:
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
Expand All @@ -104,16 +108,17 @@ jobs:
SIGN_ASC_IV: ${{ secrets.SIGN_ASC_IV }}

steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: temurin

- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache Maven package
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
Expand All @@ -131,19 +136,20 @@ jobs:
apcc:
needs: package

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: temurin

- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache Maven package
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@
<atlassian.spring.scanner.version>2.1.5</atlassian.spring.scanner.version>
<confapi-commons.version>0.0.34</confapi-commons.version>
<plugin.testrunner.version>2.0.1</plugin.testrunner.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!-- Compiler must be 8 so that the plugin can run on Crowd instances using Java 8 -->
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
Expand Down