Skip to content

Commit 9f73648

Browse files
committed
Add gcc-linux builds back to release-ci
1 parent ce6d6cc commit 9f73648

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

.github/workflows/nightly-release.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,17 @@ jobs:
4848
runs-on: ${{ matrix.os }}
4949
strategy:
5050
matrix:
51-
os: [ubuntu-20.04, ubuntu-22.04]
52-
mode: [newlib, linux, musl]
53-
target: [rv32gc-ilp32d, rv64gc-lp64d]
51+
os: [ubuntu-20.04, ubuntu-22.04]
52+
mode: [newlib, linux, musl]
53+
target: [rv32gc-ilp32d, rv64gc-lp64d]
54+
compiler: [gcc, llvm]
5455
exclude:
5556
- mode: musl
5657
target: rv32gc-ilp32d
58+
- mode: newlib
59+
compiler: llvm
60+
- mode: musl
61+
compiler: llvm
5762
steps:
5863
- uses: actions/checkout@v2
5964

@@ -64,18 +69,17 @@ jobs:
6469
6570
- name: install apt dependencies
6671
run: sudo ./.github/setup-apt.sh
67-
72+
6873
- name: build toolchain
6974
run: |
7075
TARGET_TUPLE=($(echo ${{ matrix.target }} | tr "-" "\n"))
7176
BUILD_TOOLCHAIN="./configure --prefix=/opt/riscv --with-arch=${TARGET_TUPLE[0]} --with-abi=${TARGET_TUPLE[1]}"
72-
if [ "${{ matrix.mode }}" == "linux" ]; then # build toolchain with llvm
77+
if [ "${{ matrix.compiler }}" == "llvm" ]; then # build toolchain with llvm
7378
$BUILD_TOOLCHAIN --enable-llvm --enable-linux
74-
sudo make -j $(nproc) all
7579
else
7680
$BUILD_TOOLCHAIN
77-
sudo make -j $(nproc) ${{ matrix.mode }}
7881
fi
82+
sudo make -j $(nproc) ${{ matrix.mode }}
7983
8084
- name: build qemu
8185
if: "${{ matrix.mode }}" == "linux"

0 commit comments

Comments
 (0)