Skip to content

Commit 0a80660

Browse files
committed
Merge master jdk-17.0.6+3 into openj9-staging
Signed-off-by: J9 Build <[email protected]>
2 parents 58c5f26 + cea8879 commit 0a80660

File tree

52 files changed

+1143
-1021
lines changed

Some content is hidden

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

52 files changed

+1143
-1021
lines changed

.github/actions/config/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ runs:
4242
run: |
4343
# Extract value from configuration file
4444
value="$(grep -h ${{ inputs.var }}= make/conf/github-actions.conf | cut -d '=' -f 2-)"
45-
echo "::set-output name=value::$value"
45+
echo "value=$value" >> $GITHUB_OUTPUT
4646
shell: bash

.github/actions/do-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ runs:
6161
$build_dir/make-support/failure-summary.log \
6262
$build_dir/make-support/failure-logs/* \
6363
failure-logs/ 2> /dev/null || true
64-
echo '::set-output name=failure::true'
64+
echo 'failure=true' >> $GITHUB_OUTPUT
6565
fi
6666
shell: bash
6767

.github/actions/get-bootjdk/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ runs:
4242
run: |
4343
# Convert platform name to upper case
4444
platform_prefix="$(echo ${{ inputs.platform }} | tr [a-z-] [A-Z_])"
45-
echo "::set-output name=value::$platform_prefix"
45+
echo "value=$platform_prefix" >> $GITHUB_OUTPUT
4646
shell: bash
4747

4848
- name: 'Get URL configuration'
@@ -105,5 +105,5 @@ runs:
105105
id: path-name
106106
run: |
107107
# Export the path
108-
echo '::set-output name=path::bootjdk/jdk'
108+
echo 'path=bootjdk/jdk' >> $GITHUB_OUTPUT
109109
shell: bash

.github/actions/get-bundles/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ runs:
103103
tests_dir="$(cygpath $tests_dir)"
104104
fi
105105
106-
echo "::set-output name=jdk::$jdk_dir"
107-
echo "::set-output name=symbols::$symbols_dir"
108-
echo "::set-output name=tests::$tests_dir"
106+
echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
107+
echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
108+
echo "tests=$tests_dir" >> $GITHUB_OUTPUT
109109
shell: bash

.github/actions/get-gtest/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ runs:
5050
id: path-name
5151
run: |
5252
# Export the path
53-
echo '::set-output name=path::gtest'
53+
echo 'path=gtest' >> $GITHUB_OUTPUT
5454
shell: bash

.github/actions/get-jtreg/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ runs:
6868
id: path-name
6969
run: |
7070
# Export the path
71-
echo '::set-output name=path::jtreg/installed'
71+
echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
7272
shell: bash

.github/actions/upload-bundles/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ runs:
6262
fi
6363
6464
if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
65-
echo '::set-output name=bundles-found::true'
65+
echo 'bundles-found=true' >> $GITHUB_OUTPUT
6666
else
67-
echo '::set-output name=bundles-found::false'
67+
echo 'bundles-found=false' >> $GITHUB_OUTPUT
6868
fi
6969
shell: bash
7070

.github/scripts/gen-test-summary.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#
2626

2727
GITHUB_STEP_SUMMARY="$1"
28+
GITHUB_OUTPUT="$2"
2829

2930
test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
3031
results_dir=build/run-test-prebuilt/test-results/$test_suite_name/text
@@ -41,12 +42,12 @@ error_count=$(echo $errors | wc -w || true)
4142

4243
if [[ "$failures" = "" && "$errors" = "" ]]; then
4344
# We know something went wrong, but not what
44-
echo '::set-output name=error-message::Unspecified test suite failure. Please see log for job for details.'
45+
echo 'error-message=Unspecified test suite failure. Please see log for job for details.' >> $GITHUB_OUTPUT
4546
exit 0
4647
fi
4748

48-
echo '::set-output name=failure::true'
49-
echo "::set-output name=error-message::Test run reported $failure_count test failure(s) and $error_count error(s). See summary for details."
49+
echo 'failure=true' >> $GITHUB_OUTPUT
50+
echo "error-message=Test run reported $failure_count test failure(s) and $error_count error(s). See summary for details." >> $GITHUB_OUTPUT
5051

5152
echo '### :boom: Test failures summary' >> $GITHUB_STEP_SUMMARY
5253

.github/workflows/build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
run: |
9090
# Set a proper suffix for packages if using a different architecture
9191
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
92-
echo '::set-output name=suffix:::${{ inputs.apt-architecture }}'
92+
echo 'suffix=:${{ inputs.apt-architecture }}' >> $GITHUB_OUTPUT
9393
fi
9494
9595
# Upgrading apt to solve libc6 installation bugs, see JDK-8260460.

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ jobs:
104104
echo 'false'
105105
}
106106
107-
echo "::set-output name=linux-x64::$(check_platform linux-x64 linux x64)"
108-
echo "::set-output name=linux-x86::$(check_platform linux-x86 linux x86)"
109-
echo "::set-output name=linux-x64-variants::$(check_platform linux-x64-variants variants)"
110-
echo "::set-output name=linux-cross-compile::$(check_platform linux-cross-compile cross-compile)"
111-
echo "::set-output name=macos-x64::$(check_platform macos-x64 macos x64)"
112-
echo "::set-output name=macos-aarch64::$(check_platform macos-aarch64 macos aarch64)"
113-
echo "::set-output name=windows-x64::$(check_platform windows-x64 windows x64)"
114-
echo "::set-output name=windows-aarch64::$(check_platform windows-aarch64 windows aarch64)"
107+
echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
108+
echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
109+
echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
110+
echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
111+
echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
112+
echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
113+
echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
114+
echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
115115
116116
###
117117
### Build jobs

0 commit comments

Comments
 (0)