Fix CI (unicode-org#4254)

hsivonen · Nov 4, 2023 · 236ec1b · 236ec1b
1 parent 126c90d
commit 236ec1b
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/provider/baked/_template_/Cargo.toml b/provider/baked/_template_/Cargo.toml
@@ -6,6 +6,7 @@
 name = "icu__component__data"
 description = "Data for the icu__component_ crate"
 license-file = "LICENSE"
+version = "_version_"
 
 authors.workspace = true
 categories.workspace = true
@@ -14,4 +15,3 @@ homepage.workspace = true
 include.workspace = true
 repository.workspace = true
 rust-version.workspace = true
-version.workspace = true
diff --git a/provider/baked/calendar/Cargo.toml b/provider/baked/calendar/Cargo.toml
diff --git a/provider/baked/casemap/Cargo.toml b/provider/baked/casemap/Cargo.toml
diff --git a/provider/baked/list/Cargo.toml b/provider/baked/list/Cargo.toml
diff --git a/provider/baked/locid_transform/Cargo.toml b/provider/baked/locid_transform/Cargo.toml
diff --git a/provider/baked/normalizer/Cargo.toml b/provider/baked/normalizer/Cargo.toml
diff --git a/provider/baked/plurals/Cargo.toml b/provider/baked/plurals/Cargo.toml
diff --git a/provider/baked/relativetime/Cargo.toml b/provider/baked/relativetime/Cargo.toml
diff --git a/provider/baked/segmenter/Cargo.toml b/provider/baked/segmenter/Cargo.toml
diff --git a/provider/baked/singlenumberformatter/Cargo.toml b/provider/baked/singlenumberformatter/Cargo.toml
diff --git a/provider/baked/timezone/Cargo.toml b/provider/baked/timezone/Cargo.toml
diff --git a/provider/baked/unitsconversion/Cargo.toml b/provider/baked/unitsconversion/Cargo.toml
diff --git a/tools/bakeddata-scripts/Cargo.toml b/tools/bakeddata-scripts/Cargo.toml
@@ -4,7 +4,7 @@
 
 [package]
 name = "bakeddata-scripts"
-version = "0.0.0"
+version.workspace = true
 publish = false
 edition = "2021"
 

diff --git a/tools/bakeddata-scripts/src/main.rs b/tools/bakeddata-scripts/src/main.rs
@@ -8,27 +8,46 @@ use icu_datagen::baked_exporter::*;
 use icu_datagen::prelude::*;
 use std::path::Path;
 
-const COMPONENTS: &[(&str, &[DataKey])] = &[
-    ("calendar", icu::calendar::provider::KEYS),
-    ("casemap", icu::casemap::provider::KEYS),
-    ("collator", icu::collator::provider::KEYS),
-    ("compactdecimal", icu_compactdecimal::provider::KEYS),
-    ("datetime", icu::datetime::provider::KEYS),
-    ("decimal", icu::decimal::provider::KEYS),
-    ("displaynames", icu::displaynames::provider::KEYS),
-    ("list", icu::list::provider::KEYS),
-    ("locid_transform", icu::locid_transform::provider::KEYS),
-    ("normalizer", icu::normalizer::provider::KEYS),
-    ("plurals", icu::plurals::provider::KEYS),
-    ("properties", icu::properties::provider::KEYS),
-    ("relativetime", icu::relativetime::provider::KEYS),
-    ("segmenter", icu::segmenter::provider::KEYS),
+const REPO_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+const COMPONENTS: &[(&str, &[DataKey], &str)] = &[
+    ("calendar", icu::calendar::provider::KEYS, REPO_VERSION),
+    ("casemap", icu::casemap::provider::KEYS, REPO_VERSION),
+    ("collator", icu::collator::provider::KEYS, "1.3.3"),
+    (
+        "compactdecimal",
+        icu_compactdecimal::provider::KEYS,
+        "1.3.4",
+    ),
+    ("datetime", icu::datetime::provider::KEYS, "1.3.4"),
+    ("decimal", icu::decimal::provider::KEYS, "1.3.4"),
+    ("displaynames", icu::displaynames::provider::KEYS, "1.3.4"),
+    ("list", icu::list::provider::KEYS, REPO_VERSION),
+    (
+        "locid_transform",
+        icu::locid_transform::provider::KEYS,
+        REPO_VERSION,
+    ),
+    ("normalizer", icu::normalizer::provider::KEYS, REPO_VERSION),
+    ("plurals", icu::plurals::provider::KEYS, REPO_VERSION),
+    ("properties", icu::properties::provider::KEYS, "1.3.4"),
+    (
+        "relativetime",
+        icu::relativetime::provider::KEYS,
+        REPO_VERSION,
+    ),
+    ("segmenter", icu::segmenter::provider::KEYS, REPO_VERSION),
     (
         "singlenumberformatter",
         icu_singlenumberformatter::provider::KEYS,
+        REPO_VERSION,
+    ),
+    ("timezone", icu::timezone::provider::KEYS, REPO_VERSION),
+    (
+        "unitsconversion",
+        icu_unitsconversion::provider::KEYS,
+        REPO_VERSION,
     ),
-    ("timezone", icu::timezone::provider::KEYS),
-    ("unitsconversion", icu_unitsconversion::provider::KEYS),
 ];
 
 fn main() {
@@ -43,16 +62,18 @@ fn main() {
     let components = if args.len() == 1 {
         COMPONENTS
             .iter()
-            .map(|(k, v)| (k.to_string(), *v))
+            .map(|(krate, keys, version)| (krate.to_string(), *keys, *version))
             .collect::<Vec<_>>()
     } else {
-        let map = std::collections::HashMap::<&str, &'static [DataKey]>::from_iter(
-            COMPONENTS.iter().copied(),
+        let map = std::collections::HashMap::<&str, (&'static [DataKey], &'static str)>::from_iter(
+            COMPONENTS
+                .iter()
+                .map(|(krate, keys, version)| (*krate, (*keys, *version))),
         );
         args.skip(1)
-            .filter_map(|arg| {
-                map.get(arg.strip_suffix('/').unwrap_or(arg.as_str()))
-                    .map(|k| (arg, *k))
+            .filter_map(|krate| {
+                map.get(krate.as_str())
+                    .map(|(keys, version)| (krate, *keys, *version))
             })
             .collect()
     };
@@ -78,7 +99,7 @@ fn main() {
 
     let template = Path::new("provider/baked/_template_");
 
-    for (component, keys) in &components {
+    for (component, keys, version) in &components {
         let path = Path::new("provider/baked").join(component);
 
         let _ = std::fs::remove_dir_all(&path);
@@ -96,7 +117,8 @@ fn main() {
                 path.join(file),
                 &std::fs::read_to_string(template.join(file))
                     .unwrap()
-                    .replace("_component_", component),
+                    .replace("_component_", component)
+                    .replace("_version_", version),
             )
             .unwrap();
         }