Skip to content

Commit 519f0ff

Browse files
Don't build unnecessary ICU4X components (#867)
1 parent 1fb3117 commit 519f0ff

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

.github/workflows/intl4x.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
cd ffi/dart
119119
dart pub get
120120
cd ../..
121-
dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic default_components,experimental_components
121+
dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
122122
123123
- name: Build Mac
124124
if: matrix.os == 'macos-latest'
@@ -130,7 +130,7 @@ jobs:
130130
cd ffi/dart
131131
dart pub get
132132
cd ../..
133-
dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
133+
dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
134134
135135
- name: Build Windows
136136
if: matrix.os == 'windows-latest'
@@ -142,7 +142,7 @@ jobs:
142142
cd ffi/dart
143143
dart pub get
144144
cd ../..
145-
dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic default_components,experimental_components
145+
dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
146146
147147
- run: echo "LOCAL_ICU4X_BINARY=$(realpath submodules/icu4x/bin/linux_x64)" >> $GITHUB_ENV
148148
if: matrix.os == 'ubuntu-latest'

.github/workflows/intl4x_artifacts.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ jobs:
6565
cd ffi/dart
6666
dart pub get
6767
cd ../..
68-
dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic default_components,experimental_components
69-
dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic default_components,experimental_components
70-
dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic default_components,experimental_components
71-
dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic default_components,experimental_components
72-
dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic default_components,experimental_components
73-
dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic default_components,experimental_components
74-
dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic default_components,experimental_components
75-
dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic default_components,experimental_components
68+
dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
69+
dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
70+
dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
71+
dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
72+
dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
73+
dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
74+
dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
75+
dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
7676
7777
cargo run -p icu_datagen -- --locales full --keys all --format blob --out bin/full.postcard
7878
@@ -99,11 +99,11 @@ jobs:
9999
cd ffi/dart
100100
dart pub get
101101
cd ../..
102-
dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic default_components,experimental_components
103-
dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic default_components,experimental_components
104-
dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic default_components,experimental_components
105-
dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
106-
dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64 dynamic default_components,experimental_components
102+
dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
103+
dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
104+
dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
105+
dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
106+
dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
107107
108108
cd provider/datagen # avoid global feature resolution
109109
rustup target add aarch64-apple-darwin
@@ -125,9 +125,9 @@ jobs:
125125
cd ffi/dart
126126
dart pub get
127127
cd ../..
128-
dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic default_components,experimental_components
129-
dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic default_components,experimental_components
130-
dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic default_components,experimental_components
128+
dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
129+
dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
130+
dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
131131
132132
cd provider/datagen # avoid global feature resolution
133133
rustup target add aarch64-pc-windows-msvc

pkgs/intl4x/hook/build.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ Future<Uri> buildLib(BuildConfig config, String workingDirectory) async {
189189
final tempDir = await Directory.systemTemp.createTemp();
190190

191191
final stdFeatures = [
192-
'default_components',
192+
'icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals',
193193
'compiled_data',
194194
'buffer_provider',
195195
'logging',
196196
'simple_logger',
197197
'experimental_components',
198198
];
199199
final noStdFeatures = [
200-
'default_components',
200+
'icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals',
201201
'compiled_data',
202202
'buffer_provider',
203203
'libc-alloc',

0 commit comments

Comments
 (0)