Update CI scripts to work with config.toml

This commit is contained in:
Guillaume Gomez 2024-02-09 16:47:28 +01:00
parent 2640b316e2
commit 0b2402fdfc
6 changed files with 22 additions and 19 deletions

View File

@ -55,13 +55,13 @@ jobs:
- name: Setup path to libgccjit - name: Setup path to libgccjit
run: | run: |
sudo dpkg --force-overwrite -i gcc-13.deb sudo dpkg --force-overwrite -i gcc-13.deb
echo /usr/lib/ > gcc_path echo 'gcc-path = "/usr/lib/"' > config.toml
- name: Set env - name: Set env
run: | run: |
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
#- name: Cache rust repository #- name: Cache rust repository
## We only clone the rust repository for rustc tests ## We only clone the rust repository for rustc tests

View File

@ -52,7 +52,10 @@ jobs:
- name: Setup path to libgccjit - name: Setup path to libgccjit
if: matrix.libgccjit_version.gcc == 'libgccjit12.so' if: matrix.libgccjit_version.gcc == 'libgccjit12.so'
run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path run: |
echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
echo "LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
- name: Download artifact - name: Download artifact
if: matrix.libgccjit_version.gcc != 'libgccjit12.so' if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
@ -62,12 +65,12 @@ jobs:
if: matrix.libgccjit_version.gcc != 'libgccjit12.so' if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
run: | run: |
sudo dpkg --force-overwrite -i gcc-13.deb sudo dpkg --force-overwrite -i gcc-13.deb
echo /usr/lib/ > gcc_path echo 'gcc-path = "/usr/lib"' > config.toml
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
- name: Set env - name: Set env
run: | run: |
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
#- name: Cache rust repository #- name: Cache rust repository

View File

@ -47,13 +47,13 @@ jobs:
run: sudo apt-get install ninja-build ripgrep llvm-14-tools libgccjit-12-dev run: sudo apt-get install ninja-build ripgrep llvm-14-tools libgccjit-12-dev
- name: Setup path to libgccjit - name: Setup path to libgccjit
run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path run: echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
- name: Set env - name: Set env
run: | run: |
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
#- name: Cache rust repository #- name: Cache rust repository
## We only clone the rust repository for rustc tests ## We only clone the rust repository for rustc tests

View File

@ -65,13 +65,13 @@ jobs:
- name: Setup path to libgccjit - name: Setup path to libgccjit
run: | run: |
sudo dpkg -i gcc-m68k-13.deb sudo dpkg -i gcc-m68k-13.deb
echo /usr/lib/ > gcc_path echo 'gcc-path = "/usr/lib/"' > config.toml
- name: Set env - name: Set env
run: | run: |
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
#- name: Cache rust repository #- name: Cache rust repository
## We only clone the rust repository for rustc tests ## We only clone the rust repository for rustc tests

View File

@ -42,13 +42,13 @@ jobs:
- name: Setup path to libgccjit - name: Setup path to libgccjit
run: | run: |
sudo dpkg --force-overwrite -i gcc-13.deb sudo dpkg --force-overwrite -i gcc-13.deb
echo /usr/lib/ > gcc_path echo 'gcc-path = "/usr/lib/"' > config.toml
- name: Set env - name: Set env
run: | run: |
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
- name: Build - name: Build
run: | run: |

View File

@ -56,13 +56,13 @@ jobs:
- name: Setup path to libgccjit - name: Setup path to libgccjit
run: | run: |
sudo dpkg --force-overwrite -i gcc-13.deb sudo dpkg --force-overwrite -i gcc-13.deb
echo /usr/lib/ > gcc_path echo 'gcc-path = "/usr/lib/"' > config.toml
- name: Set env - name: Set env
run: | run: |
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
- name: Build - name: Build
run: | run: |