Skip to content

Commit 8520bc7

Browse files
authored
Merge pull request rust-lang#174 from rust-lang/ci/ubuntu-libgccjit-12
Download libgccjit-12-dev package in the CI
2 parents 57b50df + bbc0c26 commit 8520bc7

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717

1818
strategy:
1919
fail-fast: false
@@ -45,10 +45,15 @@ jobs:
4545
path: llvm
4646

4747
- name: Install packages
48-
# `llvm-10-tools` is needed to install the `FileCheck` binary which is used for asm tests.
49-
run: sudo apt-get install ninja-build ripgrep llvm-10-tools
48+
# `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
49+
run: sudo apt-get install ninja-build ripgrep llvm-14-tools
50+
51+
- name: Install libgccjit12
52+
if: matrix.libgccjit_version.gcc == 'libgccjit12.so'
53+
run: sudo apt-get install libgccjit-12-dev
5054

5155
- name: Download artifact
56+
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
5257
uses: dawidd6/action-download-artifact@v2
5358
with:
5459
workflow: main.yml
@@ -60,6 +65,11 @@ jobs:
6065
search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
6166

6267
- name: Setup path to libgccjit
68+
if: matrix.libgccjit_version.gcc == 'libgccjit12.so'
69+
run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path
70+
71+
- name: Setup path to libgccjit
72+
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
6373
run: |
6474
echo $(readlink -f gcc-build) > gcc_path
6575
# NOTE: the filename is still libgccjit.so even when the artifact name is different.

0 commit comments

Comments
 (0)