Skip to content

Commit

Permalink
Update pinned llvm-compat nightly to 2024-05-01
Browse files Browse the repository at this point in the history
  • Loading branch information
Manishearth committed Oct 3, 2024
1 parent 6f0f29b commit 524c1d1
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
<br/>

- `ci-job-test-c`: Runs all C/C++ FFI tests; mostly important if you're changing the FFI interface.
+ Requires `clang-16` and `lld-16` with the `gold` plugin (APT packages `llvm-16` and `lld-16`).
+ Requires `clang-18` and `lld-18` with the `gold` plugin (APT packages `llvm-18` and `lld-18`).
- `ci-job-test-js`: Runs all JS/WASM/Node FFI tests; mostly important if you're changing the FFI interface.
+ 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`.
- `ci-job-nostd`: Builds ICU4X for a `#[no_std]` target to verify that it's compatible.
Expand Down
2 changes: 1 addition & 1 deletion tools/make/diplomat-coverage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2021"
diplomat_core = { workspace = true }
elsa = { workspace = true }
lazy_static = "1"
rustdoc-types = "0.22"
rustdoc-types = "0.25"
serde_json = { workspace = true }
syn-inline-mod = "0.6.0"

6 changes: 3 additions & 3 deletions tools/make/diplomat-coverage/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
if CRATES.get(krate).is_none() {
eprintln!("Parsing crate {krate}");
std::process::Command::new("rustup")
.args(["install", "nightly-2023-08-08"])
.args(["install", "nightly-2024-05-01"])
.output()
.expect("failed to install nightly");
let output = std::process::Command::new("rustup")
.args([
"run",
"nightly-2023-08-08",
"nightly-2024-05-01",
"cargo",
"rustdoc",
"-Zsparse-registry",
Expand Down Expand Up @@ -357,7 +357,7 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
ItemEnum::Macro(_) => {
insert_ty(types, path, ast::DocType::Macro);
}
ItemEnum::Typedef(_) => {
ItemEnum::TypeAlias(_) => {
insert_ty(types, path, ast::DocType::Typedef);
}
ItemEnum::Variant(_) => {
Expand Down
6 changes: 3 additions & 3 deletions tutorials/c-tiny/fixeddecimal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ ALL_HEADERS := $(wildcard ${HEADERS}/*)
$(ALL_HEADERS):

GCC := gcc
CLANG := clang-16
LLD := lld-16
LLVM_COMPATIBLE_NIGHTLY = "nightly-2023-08-08"
CLANG := clang-18
LLD := lld-18
LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-05-01"

baked_data/macros.rs:
cargo install --path ../../../provider/icu4x-datagen --root target
Expand Down
6 changes: 3 additions & 3 deletions tutorials/c-tiny/segmenter/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ ALL_HEADERS := $(wildcard ${HEADERS}/*)
$(ALL_HEADERS):

GCC := gcc
CLANG := clang-16
LLD := lld-16
LLVM_COMPATIBLE_NIGHTLY = "nightly-2023-08-08"
CLANG := clang-18
LLD := lld-18
LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-05-01"

target/debug/libicu_capi.a: FORCE
cargo rustc -p icu_capi --crate-type staticlib --no-default-features --features icu_capi/compiled_data,icu_capi/segmenter,icu_capi/std
Expand Down
2 changes: 1 addition & 1 deletion tutorials/js-tiny/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ICU_CAPI := $(shell cargo metadata --format-version 1 | jq '.packages[] | select
HEADERS := ${ICU_CAPI}/bindings/js
ALL_HEADERS := $(wildcard ${HEADERS}/*)

LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2023-08-08"
LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2024-05-01"

$(ALL_HEADERS):

Expand Down
2 changes: 1 addition & 1 deletion tutorials/js-tiny/ld.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def main():
else:
new_argv += [arg]
is_export = False
result = subprocess.run(["lld-16"] + new_argv, stdout=sys.stdout, stderr=sys.stderr)
result = subprocess.run(["lld-18"] + new_argv, stdout=sys.stdout, stderr=sys.stderr)
return result.returncode

if __name__ == "__main__":
Expand Down

0 comments on commit 524c1d1

Please sign in to comment.