Skip to content

Commit 2de828c

Browse files
authored
Update pinned llvm-compat nightly to 2024-01-01 / LLVM 17 (#5647)
Fixes CI issues because test-c-tiny uses an old rustc that isn't able to understand the lockfile updated by test-c (rust-lang/cargo#14595). We should also consider having the lockfiles cleaned between jobs. <!-- Thank you for your pull request to ICU4X! Reminder: try to use [Conventional Comments](https://conventionalcomments.org/) to make comments clearer. Please see https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for general information on contributing to ICU4X. -->
1 parent 6f0f29b commit 2de828c

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
112112
<br/>
113113

114114
- `ci-job-test-c`: Runs all C/C++ FFI tests; mostly important if you're changing the FFI interface.
115-
+ Requires `clang-16` and `lld-16` with the `gold` plugin (APT packages `llvm-16` and `lld-16`).
115+
+ Requires `clang-17` and `lld-17` with the `gold` plugin (APT packages `llvm-17` and `lld-17`).
116116
- `ci-job-test-js`: Runs all JS/WASM/Node FFI tests; mostly important if you're changing the FFI interface.
117117
+ Requires Node.js version 16.18.0. This may not the one offered by the package manager; get it from the NodeJS website or `nvm`.
118118
- `ci-job-nostd`: Builds ICU4X for a `#[no_std]` target to verify that it's compatible.

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/make/diplomat-coverage/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2021"
1212
diplomat_core = { workspace = true }
1313
elsa = { workspace = true }
1414
lazy_static = "1"
15-
rustdoc-types = "0.22"
15+
rustdoc-types = "0.24"
1616
serde_json = { workspace = true }
1717
syn-inline-mod = "0.6.0"
1818

tools/make/diplomat-coverage/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
9999
if CRATES.get(krate).is_none() {
100100
eprintln!("Parsing crate {krate}");
101101
std::process::Command::new("rustup")
102-
.args(["install", "nightly-2023-08-08"])
102+
.args(["install", "nightly-2024-01-01"])
103103
.output()
104104
.expect("failed to install nightly");
105105
let output = std::process::Command::new("rustup")
106106
.args([
107107
"run",
108-
"nightly-2023-08-08",
108+
"nightly-2024-01-01",
109109
"cargo",
110110
"rustdoc",
111111
"-Zsparse-registry",
@@ -357,7 +357,7 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
357357
ItemEnum::Macro(_) => {
358358
insert_ty(types, path, ast::DocType::Macro);
359359
}
360-
ItemEnum::Typedef(_) => {
360+
ItemEnum::TypeAlias(_) => {
361361
insert_ty(types, path, ast::DocType::Typedef);
362362
}
363363
ItemEnum::Variant(_) => {

tutorials/c-tiny/fixeddecimal/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ALL_HEADERS := $(wildcard ${HEADERS}/*)
1515
$(ALL_HEADERS):
1616

1717
GCC := gcc
18-
CLANG := clang-16
19-
LLD := lld-16
20-
LLVM_COMPATIBLE_NIGHTLY = "nightly-2023-08-08"
18+
CLANG := clang-17
19+
LLD := lld-17
20+
LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-01-01"
2121

2222
baked_data/macros.rs:
2323
cargo install --path ../../../provider/icu4x-datagen --root target

tutorials/c-tiny/segmenter/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ALL_HEADERS := $(wildcard ${HEADERS}/*)
1515
$(ALL_HEADERS):
1616

1717
GCC := gcc
18-
CLANG := clang-16
19-
LLD := lld-16
20-
LLVM_COMPATIBLE_NIGHTLY = "nightly-2023-08-08"
18+
CLANG := clang-17
19+
LLD := lld-17
20+
LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-01-01"
2121

2222
target/debug/libicu_capi.a: FORCE
2323
cargo rustc -p icu_capi --crate-type staticlib --no-default-features --features icu_capi/compiled_data,icu_capi/segmenter,icu_capi/std

tutorials/js-tiny/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ICU_CAPI := $(shell cargo metadata --format-version 1 | jq '.packages[] | select
99
HEADERS := ${ICU_CAPI}/bindings/js
1010
ALL_HEADERS := $(wildcard ${HEADERS}/*)
1111

12-
LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2023-08-08"
12+
LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2024-01-01"
1313

1414
$(ALL_HEADERS):
1515

tutorials/js-tiny/ld.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def main():
3232
else:
3333
new_argv += [arg]
3434
is_export = False
35-
result = subprocess.run(["lld-16"] + new_argv, stdout=sys.stdout, stderr=sys.stderr)
35+
result = subprocess.run(["lld-17"] + new_argv, stdout=sys.stdout, stderr=sys.stderr)
3636
return result.returncode
3737

3838
if __name__ == "__main__":

0 commit comments

Comments
 (0)