Skip to content

Commit 3f78e86

Browse files
jperedadnrjperedadnr
authored
Remove default Java version from bundles jobs (#807)
* Remove default Java version from bundles jobs and pass it from release job * add java-release to early-access job
1 parent 7d0a607 commit 3f78e86

8 files changed

+25
-29
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
env:
66
JAVA_RELEASE: '24'
7-
JAVA_VERSION: '24'
7+
JAVA_VERSION: 'latest'
88

99
jobs:
1010
verify:

‎.github/workflows/bundles-kit.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ on:
77
required: true
88
type: string
99
java-release:
10-
default: '24'
11-
required: false
10+
required: true
1211
type: string
1312
java-version:
14-
default: '24'
15-
required: false
13+
required: true
1614
type: string
1715

1816
jobs:

‎.github/workflows/bundles-linux.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ on:
1010
required: true
1111
type: string
1212
java-release:
13-
default: '24'
14-
required: false
13+
required: true
1514
type: string
1615
java-version:
17-
default: '24'
18-
required: false
16+
required: true
1917
type: string
2018
javafx-version:
21-
default: '24'
22-
required: false
19+
required: true
2320
type: string
2421
test:
2522
default: false

‎.github/workflows/bundles-mac.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ on:
1010
required: true
1111
type: string
1212
java-release:
13-
default: '24'
14-
required: false
13+
required: true
1514
type: string
1615
java-version:
17-
default: '24'
18-
required: false
16+
required: true
1917
type: string
2018
javafx-version:
21-
default: '24'
22-
required: false
19+
required: true
2320
type: string
2421
test:
2522
default: false

‎.github/workflows/bundles-mac_aarch64.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ on:
1010
required: true
1111
type: string
1212
java-release:
13-
default: '24'
14-
required: false
13+
required: true
1514
type: string
1615
java-version:
17-
default: '24'
18-
required: false
16+
required: true
1917
type: string
2018
javafx-version:
21-
default: '24'
22-
required: false
19+
required: true
2320
type: string
2421
test:
2522
default: false

‎.github/workflows/bundles-windows.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ on:
1010
required: true
1111
type: string
1212
java-release:
13-
default: '24'
14-
required: false
13+
required: true
1514
type: string
1615
java-version:
17-
default: '24'
18-
required: false
16+
required: true
1917
type: string
2018
javafx-version:
21-
default: '24'
22-
required: false
19+
required: true
2320
type: string
2421
test:
2522
default: false

‎.github/workflows/early-access.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
uses: ./.github/workflows/bundles-linux.yml
5454
with:
5555
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
56+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
5657
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
5758
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
5859
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -67,6 +68,7 @@ jobs:
6768
WINDOWS_CERTNAME: ${{ secrets.WINDOWS_CERTNAME }}
6869
with:
6970
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
71+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
7072
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
7173
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
7274
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -84,6 +86,7 @@ jobs:
8486
MACSIGN_PREFIX: ${{ secrets.GLUON_MACSIGN_PREFIX }}
8587
with:
8688
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
89+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
8790
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
8891
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
8992
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -101,6 +104,7 @@ jobs:
101104
MACSIGN_PREFIX: ${{ secrets.GLUON_MACSIGN_PREFIX }}
102105
with:
103106
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
107+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
104108
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
105109
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
106110
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -110,6 +114,7 @@ jobs:
110114
needs: [precheck]
111115
uses: ./.github/workflows/bundles-kit.yml
112116
with:
117+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
113118
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
114119
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
115120

‎.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
uses: ./.github/workflows/bundles-linux.yml
7575
with:
7676
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
77+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
7778
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
7879
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
7980
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -88,6 +89,7 @@ jobs:
8889
WINDOWS_CERTNAME: ${{ secrets.WINDOWS_CERTNAME }}
8990
with:
9091
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
92+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
9193
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
9294
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
9395
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -105,6 +107,7 @@ jobs:
105107
MACSIGN_PREFIX: ${{ secrets.GLUON_MACSIGN_PREFIX }}
106108
with:
107109
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
110+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
108111
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
109112
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
110113
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -122,6 +125,7 @@ jobs:
122125
MACSIGN_PREFIX: ${{ secrets.GLUON_MACSIGN_PREFIX }}
123126
with:
124127
javafx-version: ${{ needs.precheck.outputs.JAVAFX_VERSION }}
128+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
125129
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
126130
app-version: ${{ needs.precheck.outputs.APP_VERSION }}
127131
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
@@ -131,6 +135,7 @@ jobs:
131135
needs: [precheck]
132136
uses: ./.github/workflows/bundles-kit.yml
133137
with:
138+
java-release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
134139
java-version: ${{ needs.precheck.outputs.JAVA_VERSION }}
135140
project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }}
136141

0 commit comments

Comments
 (0)