Skip to content

Commit

Permalink
Merge pull request #12 from gjwatts/release
Browse files Browse the repository at this point in the history
Update Java 21 test to use GA version
  • Loading branch information
gjwatts authored Oct 10, 2023
2 parents d58c3a8 + e95c58c commit 439a7dd
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Java CI with Gradle
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

permissions:
contents: read
Expand All @@ -20,12 +22,12 @@ jobs:
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

# Gradle java toolchain cannot find early release images, need to preload until GA is available
- name: Preload JDK 21
if: ${{ matrix.java-version == '21' }}
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
java-version: '21-ea'
distribution: 'temurin'
# - name: Preload JDK 21
# if: ${{ matrix.java-version == '21' }}
# uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
# with:
# java-version: '21-ea'
# distribution: 'temurin'

- name: Set up JDK 11
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
Expand All @@ -43,6 +45,7 @@ jobs:
./.github/workflows/scripts/verifyArtifact.sh ${{ matrix.java-version }}
- name: Upload application
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: actions/upload-artifact@013d2b89baa2f354c5ffec54c68bec4ab39a2534 #v3.1.2
with:
name: Applications
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ hs_err_pid*
# MacOS Garbage
.DS_Store
/*/.DS_Store

.classpath
.project
*/.settings

0 comments on commit 439a7dd

Please sign in to comment.