Skip to content

Commit 263d68a

Browse files
committed
Fix GN task on nightly
1 parent a46f07b commit 263d68a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ jobs:
889889
# then this line is no longer needed.
890890
- uses: actions-rs/toolchain@v1
891891
with:
892-
toolchain: ${{ env.INSTALLED_NIGHTLY_VERSION }}
892+
toolchain: $INSTALLED_NIGHTLY_VERSION
893893
override: true
894894

895895
- name: Run the example with dhat-rs to collect memory information

ffi/gn/.cargo/config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
44

55
# AUTO-GENERATED in ffi.toml
6-
76
[source.crates-io]
87
replace-with = "vendored-sources"
98

tools/scripts/gn.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ cd ffi/gn
6060
6161
rm -rf vendor
6262
output = exec --fail-on-error cargo vendor
63+
output_trimmed = trim_start ${output.stdout} # Needed since there are whitespace differences between cargo versions
64+
# Probably can be removed when we update our CI stable
6365
writefile .cargo/config "# This file is part of ICU4X. For terms of use, please see the file\n"
6466
appendfile .cargo/config "# called LICENSE at the top level of the ICU4X source tree\n"
6567
appendfile .cargo/config "# (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).\n\n"
6668
appendfile .cargo/config "# AUTO-GENERATED in ffi.toml\n"
67-
appendfile .cargo/config ${output.stdout}
69+
appendfile .cargo/config ${output_trimmed}
6870
'''
6971

7072
[tasks.gn-gen]

0 commit comments

Comments
 (0)