Skip to content

Commit b117318

Browse files
committed
WIP: github: Switch the linux-cross-aarch64 job to target riscv64
1 parent 2fa4e7a commit b117318

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171

172172
# Crosscompile the toolchain for running on Linux on a different architecture, bundle the runtime
173173
# libraries that were built in the 'linux-stage1' step above.
174-
linux-cross-aarch64:
174+
linux-cross-riscv64:
175175
runs-on: ubuntu-22.04
176176
steps:
177177
- uses: actions/checkout@v4
@@ -183,29 +183,29 @@ jobs:
183183
sudo mv llvm-mingw* /opt/llvm-mingw
184184
- name: Build
185185
run: |
186-
sudo apt-get update && sudo apt-get install g++-aarch64-linux-gnu
187-
./build-all.sh $(pwd)/install/llvm-mingw --no-runtimes --host=aarch64-linux-gnu
186+
sudo apt-get update && sudo apt-get install g++-riscv64-linux-gnu
187+
./build-all.sh $(pwd)/install/llvm-mingw --no-runtimes --host=riscv64-linux-gnu
188188
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
189189
- name: Assemble the cross-built toolchain
190190
run: |
191191
./prepare-cross-toolchain-unix.sh /opt/llvm-mingw $(pwd)/install/llvm-mingw
192192
- name: Test using the cross-built assembled toolchain
193193
run: |
194-
sudo apt-get update && sudo apt-get install qemu-user-static libc6-arm64-cross libstdc++6-arm64-cross
195-
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu ./test-libcxx-module.sh $(pwd)/install/llvm-mingw
196-
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu ./run-tests.sh $(pwd)/install/llvm-mingw
194+
sudo apt-get update && sudo apt-get install qemu-user-static libc6-riscv64-cross libstdc++6-riscv64-cross
195+
QEMU_LD_PREFIX=/usr/riscv64-linux-gnu ./test-libcxx-module.sh $(pwd)/install/llvm-mingw
196+
QEMU_LD_PREFIX=/usr/riscv64-linux-gnu ./run-tests.sh $(pwd)/install/llvm-mingw
197197
- name: Package the toolchain
198198
env:
199199
TAG: test
200200
run: |
201201
cd install
202-
DISTRO=ubuntu-$(grep DISTRIB_RELEASE /etc/lsb-release | cut -f 2 -d =)-aarch64
202+
DISTRO=ubuntu-$(grep DISTRIB_RELEASE /etc/lsb-release | cut -f 2 -d =)-riscv64
203203
NAME=llvm-mingw-$TAG-ucrt-$DISTRO
204204
mv llvm-mingw $NAME
205205
tar -Jcf ../$NAME.tar.xz --format=ustar --numeric-owner --owner=0 --group=0 --sort=name $NAME
206206
- uses: actions/upload-artifact@v4
207207
with:
208-
name: linux-ucrt-aarch64-toolchain
208+
name: linux-ucrt-riscv64-toolchain
209209
path: |
210210
llvm-mingw-*.tar.xz
211211
retention-days: 7
@@ -765,7 +765,7 @@ jobs:
765765
if: github.event_name == 'schedule'
766766
permissions:
767767
contents: write
768-
needs: [linux, linux-cross-aarch64, macos, linux-cross-windows, test-toolchain, linux-test-cross-build-ffmpeg, test-ffmpeg]
768+
needs: [linux, linux-cross-riscv64, macos, linux-cross-windows, test-toolchain, linux-test-cross-build-ffmpeg, test-ffmpeg]
769769
runs-on: ubuntu-latest
770770
steps:
771771
- name: Download all artifacts

0 commit comments

Comments
 (0)