Skip to content

Commit

Permalink
Add JDK 19 build in CI (#861)
Browse files Browse the repository at this point in the history
- Update Proguard: 7.2.2 -> 7.3.1
- Use JDK 17 for testing in Mac OS and Windows builds
- Use `actions/checkout@v3`, `actions/setup-java@v3`, and
`codecov/codecov-action@v3`
  • Loading branch information
minwoox authored Jul 26, 2023
1 parent 1fd36c0 commit 07a1fa6
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 19 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/actions_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,31 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-12, windows-latest]
java: [11]
java: [17]
include:
- java: 11
os: ubuntu-latest
coverage: true
- java: 8
os: ubuntu-latest
- java: 11
os: ubuntu-latest
- java: 17
os: ubuntu-latest
coverage: true
- java: 19
os: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- id: setup-build-jdk
name: Set up build JDK ${{ env.BUILD_JDK_VERSION }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ env.BUILD_JDK_VERSION }}

- id: setup-test-jdk
if: ${{ matrix.java != env.BUILD_JDK_VERSION }}
name: Set up test JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -70,7 +72,7 @@ jobs:

- name: Upload coverage to Codecov
if: ${{ matrix.coverage }}
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3

- name: Collecting the test reports ..
if: failure()
Expand All @@ -97,11 +99,11 @@ jobs:
env:
GRADLE_OPTS: -Xmx1280m
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- id: setup-jdk
name: Set up JDK ${{ env.BUILD_JDK_VERSION }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ env.BUILD_JDK_VERSION }}
Expand All @@ -121,11 +123,11 @@ jobs:
env:
GRADLE_OPTS: -Xmx1280m
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- id: setup-jdk
name: Set up JDK ${{ env.BUILD_JDK_VERSION }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ env.BUILD_JDK_VERSION }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
if: github.repository == 'line/centraldogma'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- id: setup-jdk-17
name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- id: setup-jdk-17
name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-armeria-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
update-armeria-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Update Armeria version to ${{ inputs.armeria_version }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mockito = "4.11.0"
nexus-publish-plugin = "1.3.0"
node-gradle-plugin = "5.0.0"
osdetector = "1.7.3"
proguard = "7.2.2"
proguard = "7.3.1"
quartz = "2.3.2"
shadow-gradle-plugin = "7.1.2"
shiro = "1.3.2"
Expand Down

0 comments on commit 07a1fa6

Please sign in to comment.