Skip to content

Commit

Permalink
Diplomat bump: Dart native (unicode-org#4514)
Browse files Browse the repository at this point in the history
  • Loading branch information
robertbastian authored Jan 23, 2024
1 parent 75ab396 commit b2792e8
Show file tree
Hide file tree
Showing 93 changed files with 2,585 additions and 2,553 deletions.
50 changes: 50 additions & 0 deletions .github/workflows/artifacts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ jobs:

- name: Install Dart
uses: dart-lang/setup-dart@v1
with:
sdk: 3.3.0-279.1.beta

- name: Build docs
run: |
Expand Down Expand Up @@ -707,3 +709,51 @@ jobs:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1

dart-libs:
name: "Build Dart binaries"
if: github.ref == 'refs/heads/main' && github.repository == 'unicode-org/icu4x'
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4

- name: Install Rust toolchains
run: |
rustup toolchain install stable
- name: Show the selected Rust toolchain
run: rustup show
- uses: dart-lang/setup-dart@v1
with:
sdk: 3.3.0-279.1.beta

- name: Setup additional linkers
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get install gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-riscv64-linux-gnu gcc-i686-linux-gnu
echo "[target]" >> .cargo/config.toml
echo "aarch64-linux-android.linker=\"$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android30-clang\"" >> .cargo/config.toml
echo "armv7-linux-androideabi.linker=\"$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi30-clang\"" >> .cargo/config.toml
echo "i686-linux-android.linker=\"$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android30-clang\"" >> .cargo/config.toml
echo "x86_64-linux-android.linker=\"$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang\"" >> .cargo/config.toml
echo "riscv64-linux-android.linker=\"$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/riscv64-linux-android35-clang\"" >> .cargo/config.toml
echo "aarch64-unknown-linux-gnu.linker=\"aarch64-linux-gnu-gcc\"" >> .cargo/config.toml
echo "armv7-unknown-linux-gnueabihf.linker=\"arm-linux-gnueabihf-gcc\"" >> .cargo/config.toml
echo "riscv64gc-unknown-linux-gnu.linker=\"riscv64-linux-gnu-gcc\"" >> .cargo/config.toml
- name: Build
run: |
cd ffi/dart
dart --enable-experiment=native-assets pub get
cd ../..
dart run ffi/dart/tool/build_libs.dart bin
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: dart-${{matrix.os}}-libs
path: bin
2 changes: 2 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,8 @@ jobs:

# Job-specific dependencies
- uses: dart-lang/setup-dart@v1
with:
sdk: 3.3.0-279.1.beta

# Actual job
- name: Run `cargo make ci-job-test-dart`
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" }

# The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."`
# Diplomat must be published preceding a new ICU4X release but may use git versions in between
diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "8194def008d44fd0a36276976d5268df4e572a27" }
diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "8194def008d44fd0a36276976d5268df4e572a27" }
diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "8194def008d44fd0a36276976d5268df4e572a27" }
diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "8194def008d44fd0a36276976d5268df4e572a27" }
diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "2d647ac0b9b4c72a4f7e2b98a309cb944156877a" }
diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "2d647ac0b9b4c72a4f7e2b98a309cb944156877a" }
diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "2d647ac0b9b4c72a4f7e2b98a309cb944156877a" }
diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "2d647ac0b9b4c72a4f7e2b98a309cb944156877a" }

# Size optimized builds
[profile.release-opt-size]
Expand Down
27 changes: 12 additions & 15 deletions ffi/capi/bindings/dart/AnyCalendarKind.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions ffi/capi/bindings/dart/Bcp47ToIanaMapper.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 33 additions & 36 deletions ffi/capi/bindings/dart/Bidi.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b2792e8

Please sign in to comment.