Skip to content

Commit 9ff5a3b

Browse files
dfuchdfuch
committed
Merge
2 parents 9cdee6e + 04ca660 commit 9ff5a3b

File tree

166 files changed

+3410
-2116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+3410
-2116
lines changed

‎.github/workflows/submit.yml‎

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
runs-on: "ubuntu-latest"
1818
outputs:
1919
should_run: ${{ steps.check_submit.outputs.should_run }}
20+
bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
2021
platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }}
2122
platform_windows_x64: ${{ steps.check_platforms.outputs.platform_windows_x64 }}
2223
platform_macos_x64: ${{ steps.check_platforms.outputs.platform_macos_x64 }}
@@ -36,7 +37,7 @@ jobs:
3637
if: steps.check_submit.outputs.should_run != 'false'
3738

3839
- name: Determine unique bundle identifier
39-
run: echo "::set-env name=bundleid::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
40+
run: echo "::set-output name=bundle_id::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
4041
if: steps.check_submit.outputs.should_run != 'false'
4142

4243
- name: Checkout the source
@@ -56,7 +57,7 @@ jobs:
5657
if: steps.check_submit.outputs.should_run != 'false'
5758

5859
- name: Determine the jtreg ref to checkout
59-
run: "echo ::set-env name=JTREG_REF::jtreg${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }}"
60+
run: "echo JTREG_REF=jtreg${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }} >> $GITHUB_ENV"
6061
if: steps.check_submit.outputs.should_run != 'false'
6162

6263
- name: Check if a jtreg image is present in the cache
@@ -88,7 +89,7 @@ jobs:
8889
- name: Store jtreg for use by later steps
8990
uses: actions/upload-artifact@v2
9091
with:
91-
name: transient_jtreg_${{ env.bundleid }}
92+
name: transient_jtreg_${{ steps.check_bundle_id.outputs.bundle_id }}
9293
path: ~/jtreg/
9394
if: steps.check_submit.outputs.should_run != 'false'
9495

@@ -121,9 +122,6 @@ jobs:
121122
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
122123

123124
steps:
124-
- name: Determine unique bundle identifier
125-
run: echo "::set-env name=bundleid::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
126-
127125
- name: Checkout the source
128126
uses: actions/checkout@v2
129127
with:
@@ -149,14 +147,14 @@ jobs:
149147
id: jtreg_restore
150148
uses: actions/download-artifact@v2
151149
with:
152-
name: transient_jtreg_${{ env.bundleid }}
150+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
153151
path: ~/jtreg/
154152
continue-on-error: true
155153

156154
- name: Restore jtreg artifact (retry)
157155
uses: actions/download-artifact@v2
158156
with:
159-
name: transient_jtreg_${{ env.bundleid }}
157+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
160158
path: ~/jtreg/
161159
if: steps.jtreg_restore.outcome == 'failure'
162160

@@ -192,7 +190,7 @@ jobs:
192190
- name: Persist test bundles
193191
uses: actions/upload-artifact@v2
194192
with:
195-
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ env.bundleid }}
193+
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
196194
path: |
197195
jdk/build/linux-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }}.tar.gz
198196
jdk/build/linux-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin-tests${{ matrix.artifact }}.tar.gz
@@ -251,9 +249,6 @@ jobs:
251249
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
252250

253251
steps:
254-
- name: Determine unique bundle identifier
255-
run: echo "::set-env name=bundleid::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
256-
257252
- name: Checkout the source
258253
uses: actions/checkout@v2
259254

@@ -277,29 +272,29 @@ jobs:
277272
id: jtreg_restore
278273
uses: actions/download-artifact@v2
279274
with:
280-
name: transient_jtreg_${{ env.bundleid }}
275+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
281276
path: ~/jtreg/
282277
continue-on-error: true
283278

284279
- name: Restore jtreg artifact (retry)
285280
uses: actions/download-artifact@v2
286281
with:
287-
name: transient_jtreg_${{ env.bundleid }}
282+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
288283
path: ~/jtreg/
289284
if: steps.jtreg_restore.outcome == 'failure'
290285

291286
- name: Restore build artifacts
292287
id: build_restore
293288
uses: actions/download-artifact@v2
294289
with:
295-
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ env.bundleid }}
290+
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
296291
path: ~/jdk-linux-x64${{ matrix.artifact }}
297292
continue-on-error: true
298293

299294
- name: Restore build artifacts (retry)
300295
uses: actions/download-artifact@v2
301296
with:
302-
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ env.bundleid }}
297+
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
303298
path: ~/jdk-linux-x64${{ matrix.artifact }}
304299
if: steps.build_restore.outcome == 'failure'
305300

@@ -316,7 +311,7 @@ jobs:
316311
- name: Find root of jdk image dir
317312
run: |
318313
imageroot=`find ${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }} -name release -type f`
319-
echo "::set-env name=imageroot::`dirname ${imageroot}`"
314+
echo "imageroot=`dirname ${imageroot}`" >> $GITHUB_ENV
320315
321316
- name: Run tests
322317
run: >
@@ -343,7 +338,7 @@ jobs:
343338
344339
- name: Create suitable test log artifact name
345340
if: always()
346-
run: echo "::set-env name=logsuffix::`echo ${{ matrix.test }} | sed -e 's!/!_!'g -e 's! !_!'g`"
341+
run: echo "logsuffix=`echo ${{ matrix.test }} | sed -e 's!/!_!'g -e 's! !_!'g`" >> $GITHUB_ENV
347342

348343
- name: Persist test logs
349344
if: always()
@@ -378,9 +373,6 @@ jobs:
378373
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_SHA256 }}"
379374

380375
steps:
381-
- name: Determine unique bundle identifier
382-
run: echo ("::set-env name=bundleid::$env:GITHUB_ACTOR" + "_" + (-join "$env:GITHUB_SHA"[0..7]))
383-
384376
- name: Restore cygwin packages from cache
385377
id: cygwin
386378
uses: actions/cache@v2
@@ -427,14 +419,14 @@ jobs:
427419
id: jtreg_restore
428420
uses: actions/download-artifact@v2
429421
with:
430-
name: transient_jtreg_${{ env.bundleid }}
422+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
431423
path: ~/jtreg/
432424
continue-on-error: true
433425

434426
- name: Restore jtreg artifact (retry)
435427
uses: actions/download-artifact@v2
436428
with:
437-
name: transient_jtreg_${{ env.bundleid }}
429+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
438430
path: ~/jtreg/
439431
if: steps.jtreg_restore.outcome == 'failure'
440432

@@ -464,7 +456,7 @@ jobs:
464456
- name: Persist test bundles
465457
uses: actions/upload-artifact@v2
466458
with:
467-
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ env.bundleid }}
459+
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
468460
path: |
469461
jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}.zip
470462
jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}.tar.gz
@@ -524,9 +516,6 @@ jobs:
524516
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_SHA256 }}"
525517

526518
steps:
527-
- name: Determine unique bundle identifier
528-
run: echo ("::set-env name=bundleid::$env:GITHUB_ACTOR" + "_" + (-join "$env:GITHUB_SHA"[0..7]))
529-
530519
- name: Checkout the source
531520
uses: actions/checkout@v2
532521

@@ -564,29 +553,29 @@ jobs:
564553
id: jtreg_restore
565554
uses: actions/download-artifact@v2
566555
with:
567-
name: transient_jtreg_${{ env.bundleid }}
556+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
568557
path: ~/jtreg/
569558
continue-on-error: true
570559

571560
- name: Restore jtreg artifact (retry)
572561
uses: actions/download-artifact@v2
573562
with:
574-
name: transient_jtreg_${{ env.bundleid }}
563+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
575564
path: ~/jtreg/
576565
if: steps.jtreg_restore.outcome == 'failure'
577566

578567
- name: Restore build artifacts
579568
id: build_restore
580569
uses: actions/download-artifact@v2
581570
with:
582-
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ env.bundleid }}
571+
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
583572
path: ~/jdk-windows-x64${{ matrix.artifact }}
584573
continue-on-error: true
585574

586575
- name: Restore build artifacts (retry)
587576
uses: actions/download-artifact@v2
588577
with:
589-
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ env.bundleid }}
578+
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
590579
path: ~/jdk-windows-x64${{ matrix.artifact }}
591580
if: steps.build_restore.outcome == 'failure'
592581

@@ -606,7 +595,7 @@ jobs:
606595
tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}"
607596
608597
- name: Find root of jdk image dir
609-
run: echo ("::set-env name=imageroot::" + (Get-ChildItem -Path $HOME/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }} -Filter release -Recurse -ErrorAction SilentlyContinue -Force).DirectoryName)
598+
run: echo ("imageroot=" + (Get-ChildItem -Path $HOME/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }} -Filter release -Recurse -ErrorAction SilentlyContinue -Force).DirectoryName) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
610599

611600
- name: Run tests
612601
run: >
@@ -636,7 +625,7 @@ jobs:
636625
637626
- name: Create suitable test log artifact name
638627
if: always()
639-
run: echo ("::set-env name=logsuffix::" + ("${{ matrix.test }}" -replace "/", "_" -replace " ", "_"))
628+
run: echo ("logsuffix=" + ("${{ matrix.test }}" -replace "/", "_" -replace " ", "_")) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
640629

641630
- name: Persist test logs
642631
if: always()
@@ -672,9 +661,6 @@ jobs:
672661
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_SHA256 }}"
673662

674663
steps:
675-
- name: Determine unique bundle identifier
676-
run: echo "::set-env name=bundleid::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
677-
678664
- name: Checkout the source
679665
uses: actions/checkout@v2
680666
with:
@@ -700,14 +686,14 @@ jobs:
700686
id: jtreg_restore
701687
uses: actions/download-artifact@v2
702688
with:
703-
name: transient_jtreg_${{ env.bundleid }}
689+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
704690
path: ~/jtreg/
705691
continue-on-error: true
706692

707693
- name: Restore jtreg artifact (retry)
708694
uses: actions/download-artifact@v2
709695
with:
710-
name: transient_jtreg_${{ env.bundleid }}
696+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
711697
path: ~/jtreg/
712698
if: steps.jtreg_restore.outcome == 'failure'
713699

@@ -743,7 +729,7 @@ jobs:
743729
- name: Persist test bundles
744730
uses: actions/upload-artifact@v2
745731
with:
746-
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ env.bundleid }}
732+
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
747733
path: |
748734
jdk/build/macos-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_osx-x64_bin${{ matrix.artifact }}.tar.gz
749735
jdk/build/macos-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_osx-x64_bin-tests${{ matrix.artifact }}.tar.gz
@@ -802,9 +788,6 @@ jobs:
802788
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_SHA256 }}"
803789

804790
steps:
805-
- name: Determine unique bundle identifier
806-
run: echo "::set-env name=bundleid::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
807-
808791
- name: Checkout the source
809792
uses: actions/checkout@v2
810793

@@ -828,29 +811,29 @@ jobs:
828811
id: jtreg_restore
829812
uses: actions/download-artifact@v2
830813
with:
831-
name: transient_jtreg_${{ env.bundleid }}
814+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
832815
path: ~/jtreg/
833816
continue-on-error: true
834817

835818
- name: Restore jtreg artifact (retry)
836819
uses: actions/download-artifact@v2
837820
with:
838-
name: transient_jtreg_${{ env.bundleid }}
821+
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
839822
path: ~/jtreg/
840823
if: steps.jtreg_restore.outcome == 'failure'
841824

842825
- name: Restore build artifacts
843826
id: build_restore
844827
uses: actions/download-artifact@v2
845828
with:
846-
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ env.bundleid }}
829+
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
847830
path: ~/jdk-macos-x64${{ matrix.artifact }}
848831
continue-on-error: true
849832

850833
- name: Restore build artifacts (retry)
851834
uses: actions/download-artifact@v2
852835
with:
853-
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ env.bundleid }}
836+
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
854837
path: ~/jdk-macos-x64${{ matrix.artifact }}
855838
if: steps.build_restore.outcome == 'failure'
856839

@@ -870,7 +853,7 @@ jobs:
870853
- name: Find root of jdk image dir
871854
run: |
872855
imageroot=`find ${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_osx-x64_bin${{ matrix.artifact }} -name release -type f`
873-
echo "::set-env name=imageroot::`dirname ${imageroot}`"
856+
echo "imageroot=`dirname ${imageroot}`" >> $GITHUB_ENV
874857
875858
- name: Run tests
876859
run: >
@@ -897,7 +880,7 @@ jobs:
897880
898881
- name: Create suitable test log artifact name
899882
if: always()
900-
run: echo "::set-env name=logsuffix::`echo ${{ matrix.test }} | sed -e 's!/!_!'g -e 's! !_!'g`"
883+
run: echo "logsuffix=`echo ${{ matrix.test }} | sed -e 's!/!_!'g -e 's! !_!'g`" >> $GITHUB_ENV
901884

902885
- name: Persist test logs
903886
if: always()
@@ -959,11 +942,8 @@ jobs:
959942
-X DELETE "${url}";
960943
done
961944
962-
- name: Determine unique bundle identifier
963-
run: echo "::set-env name=bundleid::${GITHUB_ACTOR}_${GITHUB_SHA:0:8}"
964-
965945
- name: Upload a combined test results artifact
966946
uses: actions/upload-artifact@v2
967947
with:
968-
name: test-results_${{ env.bundleid }}
948+
name: test-results_${{ needs.prerequisites.outputs.bundle_id }}
969949
path: test-results

‎make/Main.gmk‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ $(eval $(call SetupTarget, generate-exported-symbols, \
112112
$(eval $(call DeclareRecipesForPhase, GENSRC, \
113113
TARGET_SUFFIX := gensrc-src, \
114114
FILE_PREFIX := Gensrc, \
115-
MAKE_SUBDIR := gensrc, \
116115
CHECK_MODULES := $(ALL_MODULES), \
117116
))
118117

@@ -150,7 +149,6 @@ ALL_TARGETS += $(GENSRC_TARGETS)
150149
$(eval $(call DeclareRecipesForPhase, GENDATA, \
151150
TARGET_SUFFIX := gendata, \
152151
FILE_PREFIX := Gendata, \
153-
MAKE_SUBDIR := gendata, \
154152
CHECK_MODULES := $(ALL_MODULES), \
155153
))
156154

@@ -161,7 +159,6 @@ ALL_TARGETS += $(GENDATA_TARGETS)
161159
$(eval $(call DeclareRecipesForPhase, COPY, \
162160
TARGET_SUFFIX := copy, \
163161
FILE_PREFIX := Copy, \
164-
MAKE_SUBDIR := copy, \
165162
CHECK_MODULES := $(ALL_MODULES), \
166163
))
167164

@@ -203,7 +200,6 @@ ALL_TARGETS += $(JAVA_TARGETS)
203200
$(eval $(call DeclareRecipesForPhase, LIBS, \
204201
TARGET_SUFFIX := libs, \
205202
FILE_PREFIX := Lib, \
206-
MAKE_SUBDIR := lib, \
207203
CHECK_MODULES := $(ALL_MODULES), \
208204
))
209205

@@ -216,7 +212,6 @@ ALL_TARGETS += $(LIBS_TARGETS)
216212
$(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
217213
TARGET_SUFFIX := static-libs, \
218214
FILE_PREFIX := Lib, \
219-
MAKE_SUBDIR := lib, \
220215
CHECK_MODULES := $(ALL_MODULES), \
221216
EXTRA_ARGS := STATIC_LIBS=true, \
222217
))
@@ -228,7 +223,6 @@ ALL_TARGETS += $(STATIC_LIBS_TARGETS)
228223
$(eval $(call DeclareRecipesForPhase, LAUNCHER, \
229224
TARGET_SUFFIX := launchers, \
230225
FILE_PREFIX := Launcher, \
231-
MAKE_SUBDIR := launcher, \
232226
CHECK_MODULES := $(ALL_MODULES), \
233227
))
234228

‎make/MainSupport.gmk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ endef
185185
# Param 1: Name of list to add targets to
186186
# Named params:
187187
# TARGET_SUFFIX : Suffix of target to create for recipe
188-
# MAKE_SUBDIR : Subdir for this build phase
189188
# FILE_PREFIX : File prefix for this build phase
190189
# CHECK_MODULES : List of modules to try
191190
# MULTIPLE_MAKEFILES : Set to true to handle makefiles for the same module and

0 commit comments

Comments
 (0)