Skip to content

Commit a80e71b

Browse files
authored
fix arm ci (alibaba#1544)
fix arm ci
1 parent 2c5ab9a commit a80e71b

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/ci.linux.arm.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,23 @@ jobs:
1313
arm-linux-build-and-test:
1414
name: gcc${{ matrix.gcc }}-C++${{ matrix.cxx }}
1515
if: ${{ !contains(github.event.pull_request.labels.*.name, 'needs-manual-merge') && (github.event.action != 'unlabeled' || github.event.label.name == 'needs-manual-merge') }}
16-
runs-on: ubuntu-26.04-arm
17-
container:
18-
image: ghcr.io/alibaba/photon-ut-base:latest
19-
options: --cpus 4 --shm-size 512m --privileged
16+
runs-on: arc-runner-set-arm
2017
strategy:
2118
fail-fast: false
2219
matrix:
2320
include:
24-
- gcc: 9
21+
- gcc: 8
2522
cxx: 14
2623
- gcc: 9
24+
cxx: 14
25+
- gcc: 10
2726
cxx: 17
2827
- gcc: 11
29-
cxx: 20
28+
cxx: 17
3029
- gcc: 12
31-
cxx: 23
30+
cxx: 20
3231
- gcc: 13
33-
cxx: 23
32+
cxx: 20
3433
- gcc: 14
3534
cxx: 23
3635
run_test: true
@@ -45,7 +44,9 @@ jobs:
4544

4645
- name: Build
4746
run: |
48-
source /opt/rh/gcc-toolset-${{ matrix.gcc }}/enable
47+
if [ "${{ matrix.gcc }}" != "8" ]; then
48+
source /opt/rh/gcc-toolset-${{ matrix.gcc }}/enable
49+
fi
4950
cmake -B build -D CMAKE_BUILD_TYPE=MinSizeRel \
5051
-D PHOTON_CXX_STANDARD=${{ matrix.cxx }} \
5152
-D PHOTON_ENABLE_ECOSYSTEM=ON \

0 commit comments

Comments
 (0)