Skip to content

Commit 01570ca

Browse files
shipilevshipilev
committed
8283017: GHA: Workflows break with update release versions
Reviewed-by: erikj, ihse
1 parent c0e3d10 commit 01570ca

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
@@ -23,6 +23,7 @@ jobs:
2323
outputs:
2424
should_run: ${{ steps.check_submit.outputs.should_run }}
2525
bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
26+
jdk_version: ${{ steps.check_jdk_versions.outputs.jdk_version }}
2627
platform_linux_additional: ${{ steps.check_platforms.outputs.platform_linux_additional }}
2728
platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }}
2829
platform_linux_x86: ${{ steps.check_platforms.outputs.platform_linux_x86 }}
@@ -70,6 +71,23 @@ jobs:
7071
run: "echo '${{ steps.check_deps.outputs.dependencies }}'"
7172
if: steps.check_submit.outputs.should_run != 'false'
7273

74+
- name: Determine full JDK versions
75+
id: check_jdk_versions
76+
shell: bash
77+
run: |
78+
FEATURE=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_FEATURE }}
79+
INTERIM=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_INTERIM }}
80+
UPDATE=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_UPDATE }}
81+
if [ "x${UPDATE}" != "x0" ]; then
82+
V=${FEATURE}.${INTERIM}.${UPDATE}
83+
elif [ "x${INTERIM}" != "x0" ]; then
84+
V={FEATURE}.${INTERIM}
85+
else
86+
V=${FEATURE}
87+
fi
88+
echo "::set-output name=jdk_version::${V}"
89+
if: steps.check_submit.outputs.should_run != 'false'
90+
7391
- name: Determine the jtreg ref to checkout
7492
run: "echo JTREG_REF=jtreg-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}+${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }} >> $GITHUB_ENV"
7593
if: steps.check_submit.outputs.should_run != 'false'
@@ -125,7 +143,7 @@ jobs:
125143
artifact: -debug
126144

127145
env:
128-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
146+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
129147
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
130148
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
131149
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -253,7 +271,7 @@ jobs:
253271
artifact: -debug
254272

255273
env:
256-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
274+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
257275
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
258276
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
259277
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -435,7 +453,7 @@ jobs:
435453
gnu-arch: powerpc64le
436454

437455
env:
438-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
456+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
439457
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
440458
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
441459
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -582,7 +600,7 @@ jobs:
582600

583601
# Reduced 32-bit build uses the same boot JDK as 64-bit build
584602
env:
585-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
603+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
586604
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
587605
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
588606
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -718,7 +736,7 @@ jobs:
718736

719737
# Reduced 32-bit build uses the same boot JDK as 64-bit build
720738
env:
721-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
739+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
722740
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
723741
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
724742
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -869,7 +887,7 @@ jobs:
869887
artifact: -debug
870888

871889
env:
872-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
890+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
873891
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
874892
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
875893
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 }}"
@@ -1108,7 +1126,7 @@ jobs:
11081126
artifact: -debug
11091127

11101128
env:
1111-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1129+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
11121130
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
11131131
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
11141132
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -1283,7 +1301,7 @@ jobs:
12831301
artifact: -debug
12841302

12851303
env:
1286-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1304+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
12871305
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
12881306
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
12891307
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
@@ -1384,7 +1402,7 @@ jobs:
13841402
artifact: -debug
13851403

13861404
env:
1387-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1405+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
13881406
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
13891407
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
13901408
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
@@ -1514,7 +1532,7 @@ jobs:
15141532
artifact: -debug
15151533

15161534
env:
1517-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
1535+
JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
15181536
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
15191537
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
15201538
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"

0 commit comments

Comments
 (0)