Skip to content

Commit 59546ea

Browse files
Merge download.yml into ci.yml
1 parent d04ffb0 commit 59546ea

File tree

2 files changed

+10
-107
lines changed

2 files changed

+10
-107
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,10 @@ jobs:
4949
# `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
5050
run: sudo apt-get install ninja-build ripgrep llvm-14-tools
5151

52-
- name: Download artifact
53-
run: curl -LO https://github.com/antoyo/gcc/releases/latest/download/gcc-13.deb
54-
55-
- name: Setup path to libgccjit
56-
run: |
57-
sudo dpkg --force-overwrite -i gcc-13.deb
58-
echo 'gcc-path = "/usr/lib/"' > config.toml
59-
6052
- name: Set env
6153
run: |
6254
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
63-
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
64-
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
55+
echo 'download-gccjit = true' > config.toml
6556
6657
#- name: Cache rust repository
6758
## We only clone the rust repository for rustc tests
@@ -78,6 +69,15 @@ jobs:
7869
# TODO: remove --features master when it is back to the default.
7970
./y.sh build --features master
8071
# TODO: remove --features master when it is back to the default.
72+
73+
- name: Set env (part 2)
74+
run: |
75+
# Set the `LD_LIBRARY_PATH` and `LIBRARY_PATH` env variables...
76+
echo "LD_LIBRARY_PATH="$(./y.sh info | grep -v Using) >> $GITHUB_ENV
77+
echo "LIBRARY_PATH="$(./y.sh info | grep -v Using) >> $GITHUB_ENV
78+
79+
- name: Build (part 2)
80+
run: |
8181
cargo test --features master
8282
./y.sh clean all
8383

.github/workflows/download.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)