Skip to content

Commit 0b2402f

Browse files
Update CI scripts to work with config.toml
1 parent 2640b31 commit 0b2402f

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ jobs:
5555
- name: Setup path to libgccjit
5656
run: |
5757
sudo dpkg --force-overwrite -i gcc-13.deb
58-
echo /usr/lib/ > gcc_path
58+
echo 'gcc-path = "/usr/lib/"' > config.toml
5959
6060
- name: Set env
6161
run: |
62-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
63-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
6462
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
63+
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
64+
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
6565
6666
#- name: Cache rust repository
6767
## We only clone the rust repository for rustc tests

.github/workflows/failures.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ jobs:
5252

5353
- name: Setup path to libgccjit
5454
if: matrix.libgccjit_version.gcc == 'libgccjit12.so'
55-
run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path
55+
run: |
56+
echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
57+
echo "LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
58+
echo "LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
5659
5760
- name: Download artifact
5861
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
@@ -62,12 +65,12 @@ jobs:
6265
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
6366
run: |
6467
sudo dpkg --force-overwrite -i gcc-13.deb
65-
echo /usr/lib/ > gcc_path
68+
echo 'gcc-path = "/usr/lib"' > config.toml
69+
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
70+
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
6671
6772
- name: Set env
6873
run: |
69-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
70-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
7174
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
7275
7376
#- name: Cache rust repository

.github/workflows/gcc12.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ jobs:
4747
run: sudo apt-get install ninja-build ripgrep llvm-14-tools libgccjit-12-dev
4848

4949
- name: Setup path to libgccjit
50-
run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path
50+
run: echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
5151

5252
- name: Set env
5353
run: |
54-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
55-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
5654
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
55+
echo "LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
56+
echo "LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
5757
5858
#- name: Cache rust repository
5959
## We only clone the rust repository for rustc tests

.github/workflows/m68k.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
- name: Setup path to libgccjit
6666
run: |
6767
sudo dpkg -i gcc-m68k-13.deb
68-
echo /usr/lib/ > gcc_path
68+
echo 'gcc-path = "/usr/lib/"' > config.toml
6969
7070
- name: Set env
7171
run: |
72-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
73-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
7472
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
73+
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
74+
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
7575
7676
#- name: Cache rust repository
7777
## We only clone the rust repository for rustc tests

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242
- name: Setup path to libgccjit
4343
run: |
4444
sudo dpkg --force-overwrite -i gcc-13.deb
45-
echo /usr/lib/ > gcc_path
45+
echo 'gcc-path = "/usr/lib/"' > config.toml
4646
4747
- name: Set env
4848
run: |
49-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
50-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
5149
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
50+
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
51+
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
5252
5353
- name: Build
5454
run: |

.github/workflows/stdarch.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ jobs:
5656
- name: Setup path to libgccjit
5757
run: |
5858
sudo dpkg --force-overwrite -i gcc-13.deb
59-
echo /usr/lib/ > gcc_path
59+
echo 'gcc-path = "/usr/lib/"' > config.toml
6060
6161
- name: Set env
6262
run: |
63-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
64-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
6563
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
64+
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
65+
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
6666
6767
- name: Build
6868
run: |

0 commit comments

Comments
 (0)