From c12e401a051ec9705dfee3979e21382441b2259f Mon Sep 17 00:00:00 2001 From: Colin White Date: Fri, 30 Sep 2022 15:11:10 -0700 Subject: [PATCH 1/3] Use Java 19 on CI. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39d5d867c8..059448ab2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 17 + java-version: 19 - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 17 + java-version: 19 - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -75,7 +75,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 17 + java-version: 19 - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -137,7 +137,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 17 + java-version: 19 - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: From 79c121242619d97055a68990b132450d02c237a8 Mon Sep 17 00:00:00 2001 From: Colin White Date: Fri, 30 Sep 2022 15:14:47 -0700 Subject: [PATCH 2/3] Use a variable. --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 059448ab2c..5c57f8825c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ on: - main pull_request: env: - # Increment this to manually invalidate the cache. - CACHE_VERSION: 1 + CACHE_VERSION: 1 # Increment this to invalidate the cache. + JAVA_VERSION: 19 jobs: checks: name: Checks @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: env.JAVA_VERSION - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: env.JAVA_VERSION - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -75,7 +75,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: env.JAVA_VERSION - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -137,7 +137,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: env.JAVA_VERSION - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: From 88fba06290b74e19f0833ad0fdffaa024967f523 Mon Sep 17 00:00:00 2001 From: Colin White Date: Fri, 30 Sep 2022 15:22:35 -0700 Subject: [PATCH 3/3] Attempt to fix syntax. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c57f8825c..d641dbcd85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: env.JAVA_VERSION + java-version: ${{ env.JAVA_VERSION }} - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: env.JAVA_VERSION + java-version: ${{ env.JAVA_VERSION }} - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -75,7 +75,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: env.JAVA_VERSION + java-version: ${{ env.JAVA_VERSION }} - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: @@ -137,7 +137,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: env.JAVA_VERSION + java-version: ${{ env.JAVA_VERSION }} - run: ./ci_clear_gradle_cache.sh - uses: actions/cache@v3 with: