8256393: Github Actions build on Linux should define OS and GCC versions
Reviewed-by: shade, erikj, ihse
This commit is contained in:
parent
5fedb69e66
commit
c45ab1aada
29
.github/workflows/submit.yml
vendored
29
.github/workflows/submit.yml
vendored
@ -14,7 +14,7 @@ on:
|
||||
jobs:
|
||||
prerequisites:
|
||||
name: Prerequisites
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
outputs:
|
||||
should_run: ${{ steps.check_submit.outputs.should_run }}
|
||||
bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
|
||||
@ -88,7 +88,7 @@ jobs:
|
||||
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true'
|
||||
|
||||
- name: Build jtreg
|
||||
run: sh make/build-all.sh ${JAVA_HOME}
|
||||
run: sh make/build-all.sh ${JAVA_HOME_8_X64}
|
||||
working-directory: jtreg
|
||||
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true'
|
||||
|
||||
@ -106,7 +106,7 @@ jobs:
|
||||
|
||||
linux_x64_build:
|
||||
name: Linux x64
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs: prerequisites
|
||||
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_linux_x64 != 'false'
|
||||
|
||||
@ -189,7 +189,9 @@ jobs:
|
||||
path: gtest
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get install libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
|
||||
run: |
|
||||
sudo apt-get install gcc-10=10.2.0-5ubuntu1~20.04 g++-10=10.2.0-5ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
|
||||
|
||||
- name: Configure
|
||||
run: >
|
||||
@ -221,7 +223,7 @@ jobs:
|
||||
|
||||
linux_x64_test:
|
||||
name: Linux x64
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs:
|
||||
- prerequisites
|
||||
- linux_x64_build
|
||||
@ -400,7 +402,7 @@ jobs:
|
||||
|
||||
linux_aarch64_build:
|
||||
name: Linux aarch64
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs:
|
||||
- prerequisites
|
||||
- linux_x64_build
|
||||
@ -536,7 +538,7 @@ jobs:
|
||||
|
||||
linux_arm_build:
|
||||
name: Linux arm
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs:
|
||||
- prerequisites
|
||||
- linux_x64_build
|
||||
@ -672,7 +674,7 @@ jobs:
|
||||
|
||||
linux_s390x_build:
|
||||
name: Linux s390x
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs:
|
||||
- prerequisites
|
||||
- linux_x64_build
|
||||
@ -808,7 +810,7 @@ jobs:
|
||||
|
||||
linux_ppc64le_build:
|
||||
name: Linux ppc64le
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs:
|
||||
- prerequisites
|
||||
- linux_x64_build
|
||||
@ -944,7 +946,7 @@ jobs:
|
||||
|
||||
linux_x86_build:
|
||||
name: Linux x86
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs: prerequisites
|
||||
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_linux_x86 != 'false'
|
||||
|
||||
@ -1018,7 +1020,8 @@ jobs:
|
||||
run: |
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt-get update
|
||||
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
|
||||
sudo apt-get install gcc-10-multilib g++-10-multilib libfreetype6-dev:i386 libxrandr-dev:i386 libxtst-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libcups2-dev:i386 libasound2-dev:i386
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
|
||||
|
||||
- name: Configure
|
||||
run: >
|
||||
@ -1051,7 +1054,7 @@ jobs:
|
||||
|
||||
linux_x86_test:
|
||||
name: Linux x86
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
needs:
|
||||
- prerequisites
|
||||
- linux_x86_build
|
||||
@ -1842,7 +1845,7 @@ jobs:
|
||||
|
||||
artifacts:
|
||||
name: Post-process artifacts
|
||||
runs-on: "ubuntu-latest"
|
||||
runs-on: "ubuntu-20.04"
|
||||
if: always()
|
||||
continue-on-error: true
|
||||
needs:
|
||||
|
Loading…
Reference in New Issue
Block a user