Skip to content

Commit 4c7d99c

Browse files
author
David Simms
committedOct 28, 2020
Remove 32-bit builds from GH actions
1 parent a15b665 commit 4c7d99c

File tree

1 file changed

+0
-99
lines changed

1 file changed

+0
-99
lines changed
 

‎.github/workflows/submit.yml

-99
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
outputs:
1919
should_run: ${{ steps.check_submit.outputs.should_run }}
2020
bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
21-
platform_linux_x32: ${{ steps.check_platforms.outputs.platform_linux_x32 }}
2221
platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }}
2322
platform_windows_x64: ${{ steps.check_platforms.outputs.platform_windows_x64 }}
2423
platform_macos_x64: ${{ steps.check_platforms.outputs.platform_macos_x64 }}
@@ -33,7 +32,6 @@ jobs:
3332
id: check_platforms
3433
run: |
3534
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'))) }}"
36-
echo "::set-output name=platform_linux_x32::${{ contains(github.event.inputs.platforms, 'linux x32') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux x32'))) }}"
3735
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'))) }}"
3836
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'))) }}"
3937
if: steps.check_submit.outputs.should_run != 'false'
@@ -382,103 +380,6 @@ jobs:
382380
path: ~/linux-x64${{ matrix.artifact }}_testsupport_${{ env.logsuffix }}.zip
383381
continue-on-error: true
384382

385-
linux_x32_build:
386-
name: Linux x32
387-
runs-on: "ubuntu-latest"
388-
needs: prerequisites
389-
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_linux_x32 != 'false'
390-
391-
strategy:
392-
fail-fast: false
393-
matrix:
394-
flavor:
395-
- build debug
396-
include:
397-
- flavor: build debug
398-
flags: --enable-debug
399-
artifact: -debug
400-
401-
# Reduced 32-bit build uses the same boot JDK as 64-bit build
402-
env:
403-
JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
404-
BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
405-
BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
406-
BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
407-
BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
408-
409-
steps:
410-
- name: Checkout the source
411-
uses: actions/checkout@v2
412-
with:
413-
path: jdk
414-
415-
- name: Restore boot JDK from cache
416-
id: bootjdk
417-
uses: actions/cache@v2
418-
with:
419-
path: ~/bootjdk/${{ env.BOOT_JDK_VERSION }}
420-
key: bootjdk-${{ runner.os }}-${{ env.BOOT_JDK_VERSION }}-${{ env.BOOT_JDK_SHA256 }}-v1
421-
422-
- name: Download boot JDK
423-
run: |
424-
mkdir -p "${HOME}/bootjdk/${BOOT_JDK_VERSION}"
425-
wget -O "${HOME}/bootjdk/${BOOT_JDK_FILENAME}" "${BOOT_JDK_URL}"
426-
echo "${BOOT_JDK_SHA256} ${HOME}/bootjdk/${BOOT_JDK_FILENAME}" | sha256sum -c >/dev/null -
427-
tar -xf "${HOME}/bootjdk/${BOOT_JDK_FILENAME}" -C "${HOME}/bootjdk/${BOOT_JDK_VERSION}"
428-
mv "${HOME}/bootjdk/${BOOT_JDK_VERSION}/"*/* "${HOME}/bootjdk/${BOOT_JDK_VERSION}/"
429-
if: steps.bootjdk.outputs.cache-hit != 'true'
430-
431-
- name: Restore jtreg artifact
432-
id: jtreg_restore
433-
uses: actions/download-artifact@v2
434-
with:
435-
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
436-
path: ~/jtreg/
437-
continue-on-error: true
438-
439-
- name: Restore jtreg artifact (retry)
440-
uses: actions/download-artifact@v2
441-
with:
442-
name: transient_jtreg_${{ needs.prerequisites.outputs.bundle_id }}
443-
path: ~/jtreg/
444-
if: steps.jtreg_restore.outcome == 'failure'
445-
446-
- name: Checkout gtest sources
447-
uses: actions/checkout@v2
448-
with:
449-
repository: "google/googletest"
450-
ref: "release-${{ fromJson(needs.prerequisites.outputs.dependencies).GTEST_VERSION }}"
451-
path: gtest
452-
453-
# Roll in the multilib environment and its dependencies.
454-
# Some multilib libraries do not have proper inter-dependencies, so we have to
455-
# install their dependencies manually.
456-
- name: Install dependencies
457-
run: |
458-
sudo dpkg --add-architecture i386
459-
sudo apt-get update
460-
sudo apt-get install gcc-multilib g++-multilib libfreetype6-dev:i386 libxrandr-dev:i386 libxtst-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libcups2-dev:i386 libasound2-dev:i386
461-
462-
- name: Configure
463-
run: >
464-
bash configure
465-
--with-conf-name=linux-x32
466-
--with-target-bits=32
467-
${{ matrix.flags }}
468-
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
469-
--with-version-build=0
470-
--with-boot-jdk=${HOME}/bootjdk/${BOOT_JDK_VERSION}
471-
--with-jtreg=${HOME}/jtreg
472-
--with-gtest=${GITHUB_WORKSPACE}/gtest
473-
--with-default-make-target="product-bundles test-bundles"
474-
--with-zlib=system
475-
--enable-jtreg-failure-handler
476-
working-directory: jdk
477-
478-
- name: Build
479-
run: make CONF_NAME=linux-x32 ${{ matrix.build-target }}
480-
working-directory: jdk
481-
482383
windows_x64_build:
483384
name: Windows x64
484385
runs-on: "windows-latest"

0 commit comments

Comments
 (0)
Please sign in to comment.