From e3694ad7388452b84eae1a973a55033c51eaff99 Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Mon, 23 Nov 2020 10:26:48 +0100 Subject: [PATCH 1/9] 8256657: Add cross-compiled build for Windows+Arm64 to submit workflow This adds the cross-compiled build only, as no Windows+Arm64 machines are available on GitHub Action that we could use to run the tests. Due to cross-compilation a build JDK is required. Initially I added EA builds to be downloaded from https://jdk.java.net/16/ and used for that, but then I saw how @shipiliv attempted it for the linux cross-compilation builds in https://github.com/openjdk/jdk/pull/1147. That is using the JDK image produced by the x64 variant. This however add more stress to the "critical path", as now two more jobs depend on the x64 build first. Let's see how it works out in the long-run. A Windows+AArch64 build takes 40-50min. --- .github/workflows/submit.yml | 165 ++++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 1 deletion(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 5333ec0f1c94b..df9a4bf7874b4 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -9,7 +9,7 @@ on: platforms: description: "Platform(s) to execute on" required: true - default: "Linux aarch64, Linux arm, Linux ppc64le, Linux s390x, Linux x64, Linux x86, Windows x64, macOS x64" + default: "Linux aarch64, Linux arm, Linux ppc64le, Linux s390x, Linux x64, Linux x86, Windows aarch64, Windows x64, macOS x64" jobs: prerequisites: @@ -24,6 +24,7 @@ jobs: platform_linux_s390x: ${{ steps.check_platforms.outputs.platform_linux_s390x }} platform_linux_x86: ${{ steps.check_platforms.outputs.platform_linux_x86 }} platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }} + platform_windows_aarch64: ${{ steps.check_platforms.outputs.platform_windows_aarch64 }} platform_windows_x64: ${{ steps.check_platforms.outputs.platform_windows_x64 }} platform_macos_x64: ${{ steps.check_platforms.outputs.platform_macos_x64 }} dependencies: ${{ steps.check_deps.outputs.dependencies }} @@ -42,6 +43,7 @@ jobs: echo "::set-output name=platform_linux_s390x::${{ contains(github.event.inputs.platforms, 'linux s390x') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux s390x'))) }}" echo "::set-output name=platform_linux_x64::${{ contains(github.event.inputs.platforms, 'linux x64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux x64'))) }}" echo "::set-output name=platform_linux_x86::${{ contains(github.event.inputs.platforms, 'linux x86') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux x86'))) }}" + echo "::set-output name=platform_windows_aarch64::${{ contains(github.event.inputs.platforms, 'windows aarch64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'windows aarch64'))) }}" echo "::set-output name=platform_windows_x64::${{ contains(github.event.inputs.platforms, 'windows x64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'windows x64'))) }}" echo "::set-output name=platform_macos_x64::${{ contains(github.event.inputs.platforms, 'macos x64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'macos x64'))) }}" if: steps.check_submit.outputs.should_run != 'false' @@ -1232,6 +1234,166 @@ jobs: path: ~/linux-x86${{ matrix.artifact }}_testsupport_${{ env.logsuffix }}.zip continue-on-error: true + windows_aarch64_build: + name: Windows aarch64 + runs-on: "windows-2019" + needs: + - prerequisites + - windows_x64_build + if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_windows_aarch64 != 'false' + + strategy: + fail-fast: false + matrix: + flavor: + - build release + - build debug + include: + - flavor: build debug + build-target: hotspot + - flavor: build release + build-target: hotspot + + env: + JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}" + BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}" + BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}" + BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}" + BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_SHA256 }}" + + steps: + - name: Restore cygwin packages from cache + id: cygwin + uses: actions/cache@v2 + with: + path: ~/cygwin/packages + key: cygwin-packages-${{ runner.os }}-v1 + + - name: Install cygwin + run: | + New-Item -Force -ItemType directory -Path "$HOME\cygwin" + & curl -L "https://www.cygwin.com/setup-x86_64.exe" -o "$HOME/cygwin/setup-x86_64.exe" + Start-Process -FilePath "$HOME\cygwin\setup-x86_64.exe" -ArgumentList "--quiet-mode --packages autoconf,make,zip,unzip --root $HOME\cygwin\cygwin64 --local-package-dir $HOME\cygwin\packages --site http://mirrors.kernel.org/sourceware/cygwin --no-desktop --no-shortcuts --no-startmenu --no-admin" -Wait -NoNewWindow + + - name: Checkout the source + uses: actions/checkout@v2 + with: + path: jdk + + - name: Restore boot JDK from cache + id: bootjdk + uses: actions/cache@v2 + with: + path: ~/bootjdk/${{ env.BOOT_JDK_VERSION }} + key: bootjdk-${{ runner.os }}-${{ env.BOOT_JDK_VERSION }}-${{ env.BOOT_JDK_SHA256 }}-v1 + + - name: Download boot JDK + run: | + mkdir -p "$HOME\bootjdk\$env:BOOT_JDK_VERSION" + & curl -L "$env:BOOT_JDK_URL" -o "$HOME/bootjdk/$env:BOOT_JDK_FILENAME" + $FileHash = Get-FileHash -Algorithm SHA256 "$HOME/bootjdk/$env:BOOT_JDK_FILENAME" + $FileHash.Hash -eq $env:BOOT_JDK_SHA256 + & tar -xf "$HOME/bootjdk/$env:BOOT_JDK_FILENAME" -C "$HOME/bootjdk/$env:BOOT_JDK_VERSION" + Get-ChildItem "$HOME\bootjdk\$env:BOOT_JDK_VERSION\*\*" | Move-Item -Destination "$HOME\bootjdk\$env:BOOT_JDK_VERSION" + if: steps.bootjdk.outputs.cache-hit != 'true' + + - name: Restore build JDK + id: build_restore + uses: actions/download-artifact@v2 + with: + name: transient_jdk-windows-x64_${{ needs.prerequisites.outputs.bundle_id }} + path: ~/jdk-windows-x64 + continue-on-error: true + + - name: Unpack jdk + run: | + mkdir -p "${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin" + tar -xf "${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin.zip" -C "${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin" + + - name: Find root of build JDK image dir + run: | + build_jdk_root=`find ${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin -name release -type f` + # we are in git-bash context, but $build_jdk_root is going to be consumed in Cygwin context, so prefix the path accordingly. + echo "build_jdk_root=/cygdrive`dirname ${build_jdk_root}`" >> $GITHUB_ENV + shell: bash + + - name: Checkout gtest sources + uses: actions/checkout@v2 + with: + repository: "google/googletest" + ref: "release-${{ fromJson(needs.prerequisites.outputs.dependencies).GTEST_VERSION }}" + path: gtest + + - name: Restore jtreg artifact + id: jtreg_restore + uses: actions/download-artifact@v2 + with: + name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }} + path: ~/jtreg/ + continue-on-error: true + + - name: Restore jtreg artifact (retry) + uses: actions/download-artifact@v2 + with: + name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }} + path: ~/jtreg/ + if: steps.jtreg_restore.outcome == 'failure' + + - name: Ensure a specific version of MSVC is installed + run: > + Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe' -Wait -NoNewWindow -ArgumentList + 'modify --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" --quiet + --add Microsoft.VisualStudio.Component.VC.14.28.arm64' + + - name: Create Devkit + run: | + $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; + $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; + & bash make/devkit/createWindowsDevkit2019.sh + working-directory: jdk + + - name: Find root of devkit dir + run: | + devkit_root=`find . -name devkit.info -type f` + echo "devkit_root=`dirname ${devkit_root}`" >> $GITHUB_ENV + shell: bash + working-directory: jdk + + - name: Apply fixpath.exe Patch + run: | + curl 'https://gist.githubusercontent.com/lewurm/c099a4b5fcd8a182510cbdeebcb41f77/raw/d5badd6ee78911f79d5c3b695c61debfa54d8ced/0001-fixpath-workaround-for-win-aarch64.patch' > p.patch + git apply p.patch + working-directory: jdk + shell: bash + + - name: Configure + run: > + $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; + $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; + & bash configure + --with-conf-name=windows-aarch64 + --with-msvc-toolset-version=14.28 + --openjdk-target=aarch64-unknown-cygwin + --with-devkit=${{ env.devkit_root }} + --with-build-devkit=${{ env.devkit_root }} + ${{ matrix.flags }} + --with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA" + --with-version-build=0 + --with-boot-jdk="$HOME/bootjdk/$env:BOOT_JDK_VERSION" + --with-build-jdk=${{ env.build_jdk_root }} + --with-jtreg="$HOME/jtreg" + --with-gtest="$env:GITHUB_WORKSPACE/gtest" + --with-default-make-target="product-bundles test-bundles" + --enable-jtreg-failure-handler + working-directory: jdk + + - name: Build + run: | + $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; + $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; + & make JOBS=1 LOG=info CONF_NAME=windows-aarch64 ${{ matrix.build-target }} + working-directory: jdk + windows_x64_build: name: Windows x64 runs-on: "windows-2019" @@ -1856,6 +2018,7 @@ jobs: - linux_s390x_build - linux_x64_test - linux_x86_test + - windows_aarch64_build - windows_x64_test - macos_x64_test From 74168bc7cd5130e91aa143c12d32148f5420ce34 Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Fri, 27 Nov 2020 23:14:04 +0100 Subject: [PATCH 2/9] remove fixpath.exe workaround --- .github/workflows/submit.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index df9a4bf7874b4..1b363d482b5bf 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -1359,13 +1359,6 @@ jobs: shell: bash working-directory: jdk - - name: Apply fixpath.exe Patch - run: | - curl 'https://gist.githubusercontent.com/lewurm/c099a4b5fcd8a182510cbdeebcb41f77/raw/d5badd6ee78911f79d5c3b695c61debfa54d8ced/0001-fixpath-workaround-for-win-aarch64.patch' > p.patch - git apply p.patch - working-directory: jdk - shell: bash - - name: Configure run: > $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; From 26642726dc0c03c52dd7b118455b9e1813617173 Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Fri, 27 Nov 2020 23:19:21 +0100 Subject: [PATCH 3/9] move windows_aarch64_build next to other builds --- .github/workflows/submit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 951753d85171a..9e5391c5003f1 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -1617,9 +1617,9 @@ jobs: needs: - prerequisites - linux_additional_build + - windows_aarch64_build - linux_x64_test - linux_x86_test - - windows_aarch64_build - windows_x64_test - macos_x64_test From 35febd5d7953f05eb5ff8458220a27460f2960d4 Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Fri, 27 Nov 2020 23:19:58 +0100 Subject: [PATCH 4/9] remove release build --- .github/workflows/submit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 9e5391c5003f1..55152f5bed3c1 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -859,13 +859,10 @@ jobs: fail-fast: false matrix: flavor: - - build release - build debug include: - flavor: build debug build-target: hotspot - - flavor: build release - build-target: hotspot env: JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}" From bef54be2a3ff90f246e44de148625e4883cebc1c Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Fri, 27 Nov 2020 23:25:51 +0100 Subject: [PATCH 5/9] todo note for caching devkit --- .github/workflows/submit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 55152f5bed3c1..2f26b64c1866f 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -959,6 +959,7 @@ jobs: run: | $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; + # TODO: add cache for devkit. Modify script so that the target directory can be specified. & bash make/devkit/createWindowsDevkit2019.sh working-directory: jdk From 2ed1cd2dfe935caae59c6250c73bad73b0e0588f Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Mon, 7 Dec 2020 20:19:40 +0100 Subject: [PATCH 6/9] remove devkit usage on win-aarch64 --- .github/workflows/submit.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 87c0579090d7a..eb2b19329c9db 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -955,21 +955,6 @@ jobs: 'modify --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" --quiet --add Microsoft.VisualStudio.Component.VC.14.28.arm64' - - name: Create Devkit - run: | - $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; - $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; - # TODO: add cache for devkit. Modify script so that the target directory can be specified. - & bash make/devkit/createWindowsDevkit2019.sh - working-directory: jdk - - - name: Find root of devkit dir - run: | - devkit_root=`find . -name devkit.info -type f` - echo "devkit_root=`dirname ${devkit_root}`" >> $GITHUB_ENV - shell: bash - working-directory: jdk - - name: Configure run: > $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; @@ -978,8 +963,6 @@ jobs: --with-conf-name=windows-aarch64 --with-msvc-toolset-version=14.28 --openjdk-target=aarch64-unknown-cygwin - --with-devkit=${{ env.devkit_root }} - --with-build-devkit=${{ env.devkit_root }} ${{ matrix.flags }} --with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA" --with-version-build=0 From 34d1ea2497de10603f00b0cb29430012bfbc42ff Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Mon, 7 Dec 2020 20:27:45 +0100 Subject: [PATCH 7/9] change default target to hotspot and align with updated x64 bits --- .github/workflows/submit.yml | 41 ++++++++++-------------------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index eb2b19329c9db..ddce686de96d4 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -850,9 +850,7 @@ jobs: windows_aarch64_build: name: Windows aarch64 runs-on: "windows-2019" - needs: - - prerequisites - - windows_x64_build + needs: prerequisites if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_windows_aarch64 != 'false' strategy: @@ -862,7 +860,8 @@ jobs: - build debug include: - flavor: build debug - build-target: hotspot + flags: --enable-debug + artifact: -debug env: JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}" @@ -907,26 +906,6 @@ jobs: Get-ChildItem "$HOME\bootjdk\$env:BOOT_JDK_VERSION\*\*" | Move-Item -Destination "$HOME\bootjdk\$env:BOOT_JDK_VERSION" if: steps.bootjdk.outputs.cache-hit != 'true' - - name: Restore build JDK - id: build_restore - uses: actions/download-artifact@v2 - with: - name: transient_jdk-windows-x64_${{ needs.prerequisites.outputs.bundle_id }} - path: ~/jdk-windows-x64 - continue-on-error: true - - - name: Unpack jdk - run: | - mkdir -p "${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin" - tar -xf "${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin.zip" -C "${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin" - - - name: Find root of build JDK image dir - run: | - build_jdk_root=`find ${HOME}/jdk-windows-x64/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin -name release -type f` - # we are in git-bash context, but $build_jdk_root is going to be consumed in Cygwin context, so prefix the path accordingly. - echo "build_jdk_root=/cygdrive`dirname ${build_jdk_root}`" >> $GITHUB_ENV - shell: bash - - name: Checkout gtest sources uses: actions/checkout@v2 with: @@ -959,6 +938,9 @@ jobs: run: > $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; + $env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ; + $env:JT_HOME = cygpath "$HOME/jtreg" ; + $env:GTEST = cygpath "$env:GITHUB_WORKSPACE/gtest" ; & bash configure --with-conf-name=windows-aarch64 --with-msvc-toolset-version=14.28 @@ -966,11 +948,10 @@ jobs: ${{ matrix.flags }} --with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA" --with-version-build=0 - --with-boot-jdk="$HOME/bootjdk/$env:BOOT_JDK_VERSION" - --with-build-jdk=${{ env.build_jdk_root }} - --with-jtreg="$HOME/jtreg" - --with-gtest="$env:GITHUB_WORKSPACE/gtest" - --with-default-make-target="product-bundles test-bundles" + --with-boot-jdk="$env:BOOT_JDK" + --with-jtreg="$env:JT_HOME" + --with-gtest="$env:GTEST" + --with-default-make-target="hotspot" --enable-jtreg-failure-handler working-directory: jdk @@ -978,7 +959,7 @@ jobs: run: | $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; - & make JOBS=1 LOG=info CONF_NAME=windows-aarch64 ${{ matrix.build-target }} + & make CONF_NAME=windows-aarch64 working-directory: jdk windows_x64_build: From 4a1e08d5063a827771de033eecb0f39274767984 Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Mon, 7 Dec 2020 20:30:49 +0100 Subject: [PATCH 8/9] merge mistakes --- .github/workflows/submit.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index ddce686de96d4..20b7bf2a03901 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -9,7 +9,7 @@ on: platforms: description: "Platform(s) to execute on" required: true - default: "Linux additional (hotspot only), Linux x64, Linux x86, Windows aarch64 Windows x64, macOS x64" + default: "Linux additional (hotspot only), Linux x64, Linux x86, Windows aarch64, Windows x64, macOS x64" jobs: prerequisites: @@ -20,6 +20,7 @@ jobs: bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }} platform_linux_additional: ${{ steps.check_platforms.outputs.platform_linux_additional }} platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }} + platform_linux_x86: ${{ steps.check_platforms.outputs.platform_linux_x86 }} platform_windows_aarch64: ${{ steps.check_platforms.outputs.platform_windows_aarch64 }} platform_windows_x64: ${{ steps.check_platforms.outputs.platform_windows_x64 }} platform_macos_x64: ${{ steps.check_platforms.outputs.platform_macos_x64 }} From c07f5d72a1da9271969b75dda751a83714ba9309 Mon Sep 17 00:00:00 2001 From: Bernhard Urban-Forster Date: Wed, 9 Dec 2020 08:18:23 +0100 Subject: [PATCH 9/9] remove gtest and jtreg --- .github/workflows/submit.yml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 20b7bf2a03901..7f6fa10f499cd 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -907,28 +907,6 @@ jobs: Get-ChildItem "$HOME\bootjdk\$env:BOOT_JDK_VERSION\*\*" | Move-Item -Destination "$HOME\bootjdk\$env:BOOT_JDK_VERSION" if: steps.bootjdk.outputs.cache-hit != 'true' - - name: Checkout gtest sources - uses: actions/checkout@v2 - with: - repository: "google/googletest" - ref: "release-${{ fromJson(needs.prerequisites.outputs.dependencies).GTEST_VERSION }}" - path: gtest - - - name: Restore jtreg artifact - id: jtreg_restore - uses: actions/download-artifact@v2 - with: - name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }} - path: ~/jtreg/ - continue-on-error: true - - - name: Restore jtreg artifact (retry) - uses: actions/download-artifact@v2 - with: - name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }} - path: ~/jtreg/ - if: steps.jtreg_restore.outcome == 'failure' - - name: Ensure a specific version of MSVC is installed run: > Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe' -Wait -NoNewWindow -ArgumentList @@ -940,8 +918,6 @@ jobs: $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ; $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ; $env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ; - $env:JT_HOME = cygpath "$HOME/jtreg" ; - $env:GTEST = cygpath "$env:GITHUB_WORKSPACE/gtest" ; & bash configure --with-conf-name=windows-aarch64 --with-msvc-toolset-version=14.28 @@ -950,10 +926,7 @@ jobs: --with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA" --with-version-build=0 --with-boot-jdk="$env:BOOT_JDK" - --with-jtreg="$env:JT_HOME" - --with-gtest="$env:GTEST" --with-default-make-target="hotspot" - --enable-jtreg-failure-handler working-directory: jdk - name: Build