Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.

Commit c45ab1a

Browse files
committed
8256393: Github Actions build on Linux should define OS and GCC versions
Reviewed-by: shade, erikj, ihse
1 parent 5fedb69 commit c45ab1a

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

.github/workflows/submit.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
prerequisites:
1616
name: Prerequisites
17-
runs-on: "ubuntu-latest"
17+
runs-on: "ubuntu-20.04"
1818
outputs:
1919
should_run: ${{ steps.check_submit.outputs.should_run }}
2020
bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
@@ -88,7 +88,7 @@ jobs:
8888
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true'
8989

9090
- name: Build jtreg
91-
run: sh make/build-all.sh ${JAVA_HOME}
91+
run: sh make/build-all.sh ${JAVA_HOME_8_X64}
9292
working-directory: jtreg
9393
if: steps.check_submit.outputs.should_run != 'false' && steps.jtreg.outputs.cache-hit != 'true'
9494

@@ -106,7 +106,7 @@ jobs:
106106

107107
linux_x64_build:
108108
name: Linux x64
109-
runs-on: "ubuntu-latest"
109+
runs-on: "ubuntu-20.04"
110110
needs: prerequisites
111111
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_linux_x64 != 'false'
112112

@@ -189,7 +189,9 @@ jobs:
189189
path: gtest
190190

191191
- name: Install dependencies
192-
run: sudo apt-get install libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
192+
run: |
193+
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
194+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
193195
194196
- name: Configure
195197
run: >
@@ -221,7 +223,7 @@ jobs:
221223

222224
linux_x64_test:
223225
name: Linux x64
224-
runs-on: "ubuntu-latest"
226+
runs-on: "ubuntu-20.04"
225227
needs:
226228
- prerequisites
227229
- linux_x64_build
@@ -400,7 +402,7 @@ jobs:
400402

401403
linux_aarch64_build:
402404
name: Linux aarch64
403-
runs-on: "ubuntu-latest"
405+
runs-on: "ubuntu-20.04"
404406
needs:
405407
- prerequisites
406408
- linux_x64_build
@@ -536,7 +538,7 @@ jobs:
536538

537539
linux_arm_build:
538540
name: Linux arm
539-
runs-on: "ubuntu-latest"
541+
runs-on: "ubuntu-20.04"
540542
needs:
541543
- prerequisites
542544
- linux_x64_build
@@ -672,7 +674,7 @@ jobs:
672674

673675
linux_s390x_build:
674676
name: Linux s390x
675-
runs-on: "ubuntu-latest"
677+
runs-on: "ubuntu-20.04"
676678
needs:
677679
- prerequisites
678680
- linux_x64_build
@@ -808,7 +810,7 @@ jobs:
808810

809811
linux_ppc64le_build:
810812
name: Linux ppc64le
811-
runs-on: "ubuntu-latest"
813+
runs-on: "ubuntu-20.04"
812814
needs:
813815
- prerequisites
814816
- linux_x64_build
@@ -944,7 +946,7 @@ jobs:
944946

945947
linux_x86_build:
946948
name: Linux x86
947-
runs-on: "ubuntu-latest"
949+
runs-on: "ubuntu-20.04"
948950
needs: prerequisites
949951
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_linux_x86 != 'false'
950952

@@ -1018,7 +1020,8 @@ jobs:
10181020
run: |
10191021
sudo dpkg --add-architecture i386
10201022
sudo apt-get update
1021-
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
1023+
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
1024+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
10221025
10231026
- name: Configure
10241027
run: >
@@ -1051,7 +1054,7 @@ jobs:
10511054

10521055
linux_x86_test:
10531056
name: Linux x86
1054-
runs-on: "ubuntu-latest"
1057+
runs-on: "ubuntu-20.04"
10551058
needs:
10561059
- prerequisites
10571060
- linux_x86_build
@@ -1842,7 +1845,7 @@ jobs:
18421845

18431846
artifacts:
18441847
name: Post-process artifacts
1845-
runs-on: "ubuntu-latest"
1848+
runs-on: "ubuntu-20.04"
18461849
if: always()
18471850
continue-on-error: true
18481851
needs:

0 commit comments

Comments
 (0)