Skip to content

Commit c295df9

Browse files
authored
Merge pull request #156 from ojeda/ppc
PowerPC: GCC, docs, release config, more CI, avoid recompilation of `rust/`...
2 parents d8647ea + 02f9a2e commit c295df9

File tree

6 files changed

+1510
-20
lines changed

6 files changed

+1510
-20
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,34 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
arch: [x86_64, arm64]
13+
arch: [arm64, ppc64le, x86_64]
1414
toolchain: [gcc, clang, llvm]
1515
config: [debug, release]
1616
rustc: [2021-02-20]
1717
output: [src] # [src, build]
1818
install: [rustup] # [rustup, standalone]
1919
sysroot: [common] # [common, custom]
2020

21+
# Exclude `LLVM=1` where not supported.
22+
exclude:
23+
- arch: ppc64le
24+
toolchain: llvm
25+
2126
# A few independent combinations to avoid exploding the matrix:
2227
# - The other option for `output`.
2328
# - Different nightlies for `rustc`.
2429
# - The other three (`install`, `sysroot`) combinations
2530
# (they are interrelated, so the cross-product needs to be tested)
2631
include:
27-
- arch: x86_64
32+
- arch: arm64
2833
toolchain: gcc
2934
config: debug
3035
rustc: 2021-02-20
3136
output: build
3237
install: rustup
3338
sysroot: custom
3439

35-
- arch: arm64
40+
- arch: ppc64le
3641
toolchain: clang
3742
config: release
3843
rustc: 2021-02-20
@@ -48,14 +53,6 @@ jobs:
4853
install: standalone
4954
sysroot: custom
5055

51-
- arch: ppc64le
52-
toolchain: clang
53-
config: debug
54-
rustc: 2021-02-20
55-
output: src
56-
install: rustup
57-
sysroot: common
58-
5956
steps:
6057
# Setup: checkout
6158
- uses: actions/checkout@v2
@@ -122,7 +119,7 @@ jobs:
122119
- if: matrix.arch == 'arm64'
123120
run: sudo apt-get install -y qemu-system-arm
124121
- if: matrix.arch == 'ppc64le'
125-
run: sudo apt-get install -y qemu-system-ppc64
122+
run: sudo apt-get install -y qemu-system-ppc
126123

127124
# Setup: rustc
128125
- if: matrix.install == 'rustup'

0 commit comments

Comments
 (0)