Skip to content

Commit 1012fd7

Browse files
shipilevgnu-andrew
shipilev
authored and
gnu-andrew
committed
8283017: GHA: Workflows break with update release versions
Backport-of: 01570ca
1 parent 67b808d commit 1012fd7

File tree

1 file changed

+29
-11
lines changed

1 file changed

+29
-11
lines changed

‎.github/workflows/submit.yml‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
outputs:
2020
should_run: ${{ steps.check_submit.outputs.should_run }}
2121
bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
22+
jdk_version: ${{ steps.check_jdk_versions.outputs.jdk_version }}
2223
platform_linux_additional: ${{ steps.check_platforms.outputs.platform_linux_additional }}
2324
platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }}
2425
platform_linux_x86: ${{ steps.check_platforms.outputs.platform_linux_x86 }}
@@ -66,6 +67,23 @@ jobs:
6667
run: "echo '${{ steps.check_deps.outputs.dependencies }}'"
6768
if: steps.check_submit.outputs.should_run != 'false'
6869

70+
- name: Determine full JDK versions
71+
id: check_jdk_versions
72+
shell: bash
73+
run: |
74+
FEATURE=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_FEATURE }}
75+
INTERIM=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_INTERIM }}
76+
UPDATE=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_UPDATE }}
77+
if [ "x${UPDATE}" != "x0" ]; then
78+
V=${FEATURE}.${INTERIM}.${UPDATE}
79+
elif [ "x${INTERIM}" != "x0" ]; then
80+
V={FEATURE}.${INTERIM}
81+
else
82+
V=${FEATURE}
83+
fi
84+
echo "::set-output name=jdk_version::${V}"
85+
if: steps.check_submit.outputs.should_run != 'false'
86+
6987
- name: Determine the jtreg ref to checkout
7088
run: "echo JTREG_REF=jtreg-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}+${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }} >> $GITHUB_ENV"
7189
if: steps.check_submit.outputs.should_run != 'false'
@@ -121,7 +139,7 @@ jobs:
121139
artifact: -debug
122140

123141
env:
124-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
142+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
125143
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
126144
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
127145
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -250,7 +268,7 @@ jobs:
250268
artifact: -debug
251269

252270
env:
253-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
271+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
254272
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
255273
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
256274
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -432,7 +450,7 @@ jobs:
432450
gnu-arch: powerpc64le
433451

434452
env:
435-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
453+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
436454
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
437455
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
438456
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -580,7 +598,7 @@ jobs:
580598

581599
# Reduced 32-bit build uses the same boot JDK as 64-bit build
582600
env:
583-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
601+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
584602
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
585603
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
586604
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -717,7 +735,7 @@ jobs:
717735

718736
# Reduced 32-bit build uses the same boot JDK as 64-bit build
719737
env:
720-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
738+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
721739
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
722740
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
723741
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -868,7 +886,7 @@ jobs:
868886
artifact: -debug
869887

870888
env:
871-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
889+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
872890
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
873891
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
874892
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -957,7 +975,7 @@ jobs:
957975
artifact: -debug
958976

959977
env:
960-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
978+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
961979
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
962980
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
963981
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -1109,7 +1127,7 @@ jobs:
11091127
artifact: -debug
11101128

11111129
env:
1112-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1130+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
11131131
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
11141132
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
11151133
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -1284,7 +1302,7 @@ jobs:
12841302
artifact: -debug
12851303

12861304
env:
1287-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1305+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
12881306
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
12891307
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
12901308
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
@@ -1386,7 +1404,7 @@ jobs:
13861404
artifact: -debug
13871405

13881406
env:
1389-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1407+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
13901408
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
13911409
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
13921410
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
@@ -1517,7 +1535,7 @@ jobs:
15171535
artifact: -debug
15181536

15191537
env:
1520-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1538+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
15211539
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
15221540
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
15231541
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"

0 commit comments

Comments
 (0)