Skip to content

Commit ece3e2b

Browse files
nakamura-tonakamura-to
authored
Use env context instead of vars context (#1031)
* Use env context instead of vars context * Fix workflow syntax
1 parent 44ce49e commit ece3e2b

File tree

3 files changed

+42
-26
lines changed

3 files changed

+42
-26
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ on:
77
branches: [ master ]
88
workflow_dispatch:
99

10+
env:
11+
JDK_DISTRIBUTION: zulu
12+
JDK_VERSION_OLDEST: 8
13+
JDK_VERSION_LATEST: 21
14+
JDK_VERSION_LATEST_LTS: 21
15+
1016
jobs:
1117
build:
1218
name: Build
@@ -17,11 +23,11 @@ jobs:
1723
- name: Set up JDKs
1824
uses: actions/setup-java@v4
1925
with:
20-
distribution: ${{ vars.JDK_DISTRIBUTION }}
26+
distribution: ${{ env.JDK_DISTRIBUTION }}
2127
java-version: |
22-
${{ vars.JDK_VERSION_OLDEST }}
23-
${{ vars.JDK_VERSION_LATEST }}
24-
${{ vars.JDK_VERSION_LATEST_LTS }}
28+
${{ env.JDK_VERSION_OLDEST }}
29+
${{ env.JDK_VERSION_LATEST }}
30+
${{ env.JDK_VERSION_LATEST_LTS }}
2531
2632
- name: Checkout
2733
uses: actions/checkout@v4
@@ -32,7 +38,7 @@ jobs:
3238
- name: Assemble and Check
3339
run: >
3440
./gradlew
35-
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ vars.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ vars.JDK_VERSION_LATEST }}_X64
41+
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ env.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ env.JDK_VERSION_LATEST }}_X64
3642
assemble check
3743
3844
- name: Upload reports
@@ -56,11 +62,11 @@ jobs:
5662
- name: Set up JDKs
5763
uses: actions/setup-java@v4
5864
with:
59-
distribution: ${{ vars.JDK_DISTRIBUTION }}
65+
distribution: ${{ env.JDK_DISTRIBUTION }}
6066
java-version: |
61-
${{ vars.JDK_VERSION_OLDEST }}
62-
${{ vars.JDK_VERSION_LATEST }}
63-
${{ vars.JDK_VERSION_LATEST_LTS }}
67+
${{ env.JDK_VERSION_OLDEST }}
68+
${{ env.JDK_VERSION_LATEST }}
69+
${{ env.JDK_VERSION_LATEST_LTS }}
6470
6571
- name: Checkout
6672
uses: actions/checkout@v4
@@ -72,17 +78,17 @@ jobs:
7278
run: >
7379
./gradlew
7480
-Pdriver=${{ matrix.driver }}
75-
-PtestJavaLangVersion=${{ vars.JDK_VERSION_OLDEST }}
76-
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ vars.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ vars.JDK_VERSION_LATEST }}_X64
81+
-PtestJavaLangVersion=${{ env.JDK_VERSION_OLDEST }}
82+
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ env.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ env.JDK_VERSION_LATEST }}_X64
7783
integration-test-java:test
7884
integration-test-kotlin:test
7985
8086
- name: Test with the latest JDK using JPMS
8187
run: >
8288
./gradlew
8389
-Pdriver=${{ matrix.driver }}
84-
-PtestJavaLangVersion=${{ vars.JDK_VERSION_LATEST }}
85-
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ vars.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ vars.JDK_VERSION_LATEST }}_X64
90+
-PtestJavaLangVersion=${{ env.JDK_VERSION_LATEST }}
91+
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ env.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ env.JDK_VERSION_LATEST }}_X64
8692
-PtestUseModule=true
8793
integration-test-java:test
8894
integration-test-java-additional:test
@@ -91,7 +97,7 @@ jobs:
9197
run: >
9298
./gradlew
9399
-Pdriver=${{ matrix.driver }}
94-
-PtestJavaLangVersion=${{ vars.JDK_VERSION_LATEST_LTS }}
100+
-PtestJavaLangVersion=${{ env.JDK_VERSION_LATEST_LTS }}
95101
-PtestUseModule=true
96102
integration-test-java:test
97103
integration-test-java-additional:test
@@ -116,11 +122,11 @@ jobs:
116122
- name: Set up JDKs
117123
uses: actions/setup-java@v4
118124
with:
119-
distribution: ${{ vars.JDK_DISTRIBUTION }}
125+
distribution: ${{ env.JDK_DISTRIBUTION }}
120126
java-version: |
121-
${{ vars.JDK_VERSION_OLDEST }}
122-
${{ vars.JDK_VERSION_LATEST }}
123-
${{ vars.JDK_VERSION_LATEST_LTS }}
127+
${{ env.JDK_VERSION_OLDEST }}
128+
${{ env.JDK_VERSION_LATEST }}
129+
${{ env.JDK_VERSION_LATEST_LTS }}
124130
125131
- name: Checkout
126132
uses: actions/checkout@v4
@@ -136,7 +142,7 @@ jobs:
136142
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
137143
run: >
138144
./gradlew
139-
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ vars.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ vars.JDK_VERSION_LATEST }}_X64
145+
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ env.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ env.JDK_VERSION_LATEST }}_X64
140146
publishToSonatype closeAndReleaseSonatypeStagingRepository
141147
142148
- name: Upload reports

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
- cron: '0 0 * * *'
66
workflow_dispatch:
77

8+
env:
9+
JDK_DISTRIBUTION: zulu
10+
JDK_VERSION_OLDEST: 8
11+
JDK_VERSION_LATEST: 21
12+
JDK_VERSION_LATEST_LTS: 21
13+
814
jobs:
915
CodeQL-Build:
1016
runs-on: ubuntu-latest
@@ -22,19 +28,19 @@ jobs:
2228
- name: Set up JDKs
2329
uses: actions/setup-java@v4
2430
with:
25-
distribution: ${{ vars.JDK_DISTRIBUTION }}
31+
distribution: ${{ env.JDK_DISTRIBUTION }}
2632
java-version: |
27-
${{ vars.JDK_VERSION_OLDEST }}
28-
${{ vars.JDK_VERSION_LATEST }}
29-
${{ vars.JDK_VERSION_LATEST_LTS }}
33+
${{ env.JDK_VERSION_OLDEST }}
34+
${{ env.JDK_VERSION_LATEST }}
35+
${{ env.JDK_VERSION_LATEST_LTS }}
3036
3137
- name: Set up Gradle
3238
uses: gradle/[email protected]
3339

3440
- name: Build
3541
run: >
3642
./gradlew
37-
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ vars.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ vars.JDK_VERSION_LATEST }}_X64
43+
-Porg.gradle.java.installations.fromEnv=JAVA_HOME_${{ env.JDK_VERSION_OLDEST }}_X64,JAVA_HOME_${{ env.JDK_VERSION_LATEST }}_X64
3844
assemble check
3945
4046
- name: Perform CodeQL Analysis

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
description: 'Release version'
88
required: false
99

10+
env:
11+
JDK_DISTRIBUTION: zulu
12+
JDK_VERSION_LATEST_LTS: 21
13+
1014
jobs:
1115
release:
1216
name: Release
@@ -39,8 +43,8 @@ jobs:
3943
- name: Set up the latest LTS JDK
4044
uses: actions/setup-java@v4
4145
with:
42-
distribution: ${{ vars.JDK_DISTRIBUTION }}
43-
java-version: ${{ vars.JDK_VERSION_LATEST_LTS }}
46+
distribution: ${{ env.JDK_DISTRIBUTION }}
47+
java-version: ${{ env.JDK_VERSION_LATEST_LTS }}
4448

4549
- name: Checkout
4650
uses: actions/checkout@v4

0 commit comments

Comments
 (0)