Skip to content

Commit 71c95a2

Browse files
authored
CI updates (Ubuntu 22, LLVM 15, pinned once_cell) (#1219)
you should probably also just merge - #1214 - #1212 pinning the `once_cell` version is a bit of a hack. It would not be needed if the rust version would update to `1.70.0`: https://doc.rust-lang.org/beta/std/cell/struct.OnceCell.html The github CI action still fails to translate curl even with these changes, and it doesn't really give any error message. So I'm not sure what to do with that.
2 parents b1766a1 + 7237633 commit 71c95a2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/internal-testsuite.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ on:
1313
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1414
jobs:
1515
# This workflow contains a single job called "build"
16-
build-on-ubuntu-2004:
16+
build-on-ubuntu-2204:
1717
# The type of runner that the job will run on
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919

2020
# Steps represent a sequence of tasks that will be executed as part of the job
2121
steps:
@@ -79,7 +79,7 @@ jobs:
7979
sudo apt-get -qq update
8080
sudo apt-get -qq install \
8181
libbrotli-dev \
82-
libclang-12-dev \
82+
libclang-15-dev \
8383
libgcrypt20 \
8484
libreadline-dev \
8585
libidn2-dev \
@@ -102,7 +102,7 @@ jobs:
102102
# Working dir is /home/runner/work/c2rust/c2rust
103103
- name: Build c2rust
104104
run: |
105-
export LLVM_CONFIG_PATH=/usr/bin/llvm-config-12
105+
export LLVM_CONFIG_PATH=/usr/bin/llvm-config-15
106106
cargo build --release
107107
108108
# TODO(pl): figure out why compile_commands.json may cause json-c to fail

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

analysis/runtime/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ publish = false
1515
[dependencies]
1616
serde = { version = "1.0", features = ["derive"] }
1717
bincode = "1.0.1"
18-
once_cell = "1"
18+
once_cell = "=1.21.2"
1919
enum_dispatch = "0.3"
2020
fs-err = "2"
2121
crossbeam-queue = "0.3"

0 commit comments

Comments
 (0)