Upgrade ICU4X to different branch

dart-lang · Jul 24, 2024 · 809a26b · 809a26b
1 parent fe1694d
commit 809a26b
Showing 1 changed file with 29 additions and 20 deletions.
diff --git a/.github/workflows/intl4x_artifacts.yml b/.github/workflows/intl4x_artifacts.yml
@@ -65,13 +65,13 @@ jobs:
         cd ffi/dart
         dart pub get
         cd ../..
-        dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic default_components,experimental_components
         dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic default_components,experimental_components
 
         cargo run -p icu_datagen -- --locales full --keys all --format blob --out bin/full.postcard
@@ -99,10 +99,10 @@ jobs:
         cd ffi/dart
         dart pub get
         cd ../..
-        dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
         dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64 dynamic default_components,experimental_components
 
         cd provider/datagen # avoid global feature resolution
@@ -125,8 +125,8 @@ jobs:
         cd ffi/dart
         dart pub get
         cd ../..
-        dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic default_components,experimental_components
-        dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic default_components,experimental_components
+        # dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic default_components,experimental_components
         dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic default_components,experimental_components
 
         cd provider/datagen # avoid global feature resolution
@@ -169,27 +169,32 @@ jobs:
           git diff --name-only --exit-code
   
   build_local:
+    needs: dart-libs
     runs-on:  ${{ matrix.os }}
 
     env:
       ICU4X_BUILD_MODE: local
-      LOCAL_ICU4X_BINARY: linux_x64
 
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
-    defaults:
-      run:
-        working-directory: pkgs/intl4x
-
     steps:
       - name: Download binaries
         uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
 
       - name: Display structure of downloaded files
         run: ls -R
 
+      - run: |
+          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+            echo "LOCAL_ICU4X_BINARY=../../linux_x64" >> $GITHUB_ENV
+          elif [ "${{ matrix.os }}" == "macos-latest" ]; then
+            echo "LOCAL_ICU4X_BINARY=../../macos_x64" >> $GITHUB_ENV
+          elif [ "${{ matrix.os }}" == "windows-latest" ]; then
+            echo "LOCAL_ICU4X_BINARY=../../windows_x64" >> $GITHUB_ENV
+          fi 
+
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           submodules: true
@@ -198,9 +203,13 @@ jobs:
         with:
           sdk: dev
 
-      - run: dart --enable-experiment=native-assets pub get
+      - run: |
+          cd pkgs/intl4x
+          dart --enable-experiment=native-assets pub get
 
-      - run: dart --enable-experiment=native-assets test
+      - run: |
+          cd pkgs/intl4x
+          dart --enable-experiment=native-assets test
 
   release:
     needs: dart-libs