Merge branch 'main' into asciitrie

.gitattributes

@@ -1,8 +1,8 @@
 *.postcard  binary
-provider/testdata/data/baked/** linguist-generated=true
-provider/repodata/data/json/** linguist-generated=true
-provider/repodata/data/cldr/** linguist-generated=true
-provider/repodata/data/icuexport/** linguist-generated=true
+provider/datagen/data/** linguist-generated=true
+provider/datagen/tests/data/json/** linguist-generated=true
+provider/datagen/tests/data/cldr/** linguist-generated=true
+provider/datagen/tests/data/icuexport/** linguist-generated=true
 ffi/diplomat/c/include/** linguist-generated=true
 ffi/diplomat/cpp/include/** linguist-generated=true
 ffi/diplomat/cpp/docs/** linguist-generated=true
@@ -11,3 +11,4 @@ ffi/diplomat/js/docs/** linguist-generated=true
 *.rs.data linguist-language=Rust
 */**/README.md linguist-generated=true
 **/data/data/** linguist-generated=true
+experimental/casemap/src/greek_to_me/data.rs linguist-generated=true

.github/workflows/artifacts-build.yml

@@ -158,10 +158,7 @@ jobs:
     - name: Init node package
       run: |
         cd ffi/diplomat/js/examples/node
-        make lib
-        make icu_capi.wasm
-        # Manually running datagen with the required keys
-        cargo run -p icu_datagen -- --key-file ../wasm-demo/required-keys.txt --locales full --format blob --out data.postcard
+        make
         cd ../wasm-demo
         npm ci
 
@@ -530,7 +527,7 @@ jobs:
           git checkout empty
           gsutil -m cp -r benchmarks/binsize/ gs://${{ env.GCP_BUCKET_ID }}/gha/${{ github.sha }}/benchmarks/binsize
 
-  # Data size benchmark: track size of provider/testdata/data/testdata.postcard (total data size).
+  # Data size benchmark: track size of provider/datagen/tests/data/testdata.postcard (total data size).
   bench-datasize:
     # This is too expensive to run on every push, so only run it on main.
     # When running on a PR, comment this out and set the BASELINE variable below to the baseline commit.
@@ -548,6 +545,10 @@ jobs:
       run: |
         mkdir -p benchmarks/datasize
 
+    - name: Generate testdata
+      run: |
+        cargo run --bin make-testdata-legacy
+
     - name: Measure size of selected data package provider/testdata/data/testdata.postcard
       run: |
         cargo run --package icu_benchmark_binsize  -- provider/testdata/data/testdata.postcard file | tee benchmarks/datasize/output.txt

.github/workflows/build-test.yml

@@ -103,13 +103,21 @@ jobs:
     - name: Show the selected Rust toolchain
       run: rustup show
 
+    # Job-specific dependencies
+    - name: Install rustfmt
+      run: rustup component add rustfmt
+
     # Actual job
     - name: Run `cargo make ci-job-test`
       run: cargo make ci-job-test
 
-  # ci-job-test-cargo-tutorial
-  test-cargo-tutorial:
+  # ci-job-test-tutorials
+  test-tutorials:
     runs-on: ubuntu-latest
+    strategy:
+      matrix: 
+        behavior: [local, cratesio]
+      fail-fast: true
     steps:
     - uses: actions/checkout@v3
 
@@ -146,8 +154,8 @@ jobs:
         path: /tmp/icu4x-source-cache
 
     # Actual job
-    - name: Run `cargo make ci-job-test-cargo-tutorial`
-      run: cargo make ci-job-test-cargo-tutorial
+    - name: Run `cargo make ci-job-test-tutorials-${{ matrix.behavior }}`
+      run: cargo make ci-job-test-tutorials-${{ matrix.behavior }}
 
   # ci-job-testdata
   testdata:

.gitignore

@@ -23,8 +23,8 @@ dhat-heap.json
 /benchmarks
 
 # Do not check-in binary file tree test data
-provider/testdata/data/postcard/*
-!provider/testdata/data/postcard/fingerprints.csv
+provider/datagen/tests/data/postcard/*
+!provider/datagen/tests/data/postcard/fingerprints.csv
 
 # Ignore irrelevant files that get generated on macOS
 **/.DS_Store

CODEOWNERS

@@ -20,7 +20,7 @@ components/plurals/               @zbraniecki @sffc
 components/segmenter/             @aethanyc @makotokato @sffc
 components/timezone/              @nordzilla
 experimental/bies/                @sffc
-experimental/casemapping/         @Manishearth
+experimental/casemap/             @Manishearth
 experimental/compactdecimal/      @eggrobin
 experimental/displaynames/        @sffc @snktd
 experimental/harfbuzz/            @hsivonen
@@ -61,7 +61,7 @@ components/normalizer/data           @unicode-org/icu4x-owners
 components/plurals/data              @unicode-org/icu4x-owners
 components/segmenter/data            @unicode-org/icu4x-owners
 components/timezone/data             @unicode-org/icu4x-owners
-experimental/casemapping/data        @unicode-org/icu4x-owners
+experimental/casemap/data            @unicode-org/icu4x-owners
 experimental/compactdecimal/data     @unicode-org/icu4x-owners
 experimental/displaynames/data       @unicode-org/icu4x-owners
 experimental/relativetime/data       @unicode-org/icu4x-owners