Skip to content

Commit cc242ac

Browse files
Update CI scripts to work with config.toml
1 parent 3b00f0c commit cc242ac

File tree

6 files changed

+7
-19
lines changed

6 files changed

+7
-19
lines changed

.github/workflows/ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ jobs:
5454
- name: Setup path to libgccjit
5555
run: |
5656
sudo dpkg --force-overwrite -i gcc-13.deb
57-
echo /usr/lib/ > gcc_path
57+
echo 'gcc-path = "/usr/lib/"' > config.toml
5858
5959
- name: Set env
6060
run: |
61-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
62-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
6361
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
6462
6563
#- name: Cache rust repository

.github/workflows/failures.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ 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: echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
5656

5757
- name: Download artifact
5858
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
@@ -62,12 +62,10 @@ jobs:
6262
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
6363
run: |
6464
sudo dpkg --force-overwrite -i gcc-13.deb
65-
echo /usr/lib/ > gcc_path
65+
echo 'gcc-path = "/usr/lib"' > config.toml
6666
6767
- name: Set env
6868
run: |
69-
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
70-
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
7169
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
7270
7371
#- name: Cache rust repository

.github/workflows/gcc12.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,10 @@ 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
5755
5856
#- name: Cache rust repository

.github/workflows/m68k.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,10 @@ 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
7573
7674
#- name: Cache rust repository

.github/workflows/release.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,10 @@ 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
5250
5351
- name: Build

.github/workflows/stdarch.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,10 @@ 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
6664
6765
- name: Build

0 commit comments

Comments
 (0)