diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8ac1586fe0e..f4c0a4f87d1 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -158,7 +158,10 @@ jobs: # ci-job-test-cargo test-cargo: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 @@ -175,11 +178,25 @@ jobs: run: rustup show # Job-specific dependencies - - name: Install harfbuzz + - name: Install harfbuzz (Linux) + if: matrix.os == 'ubuntu-latest' run: | sudo apt update sudo apt install libharfbuzz-dev + - name: Install harfbuzz (Windows) + if: matrix.os == 'windows-latest' + shell: pwsh + run: | + choco install pkgconfiglite -y + git clone --depth 1 https://github.com/microsoft/vcpkg.git + .\vcpkg\bootstrap-vcpkg.bat + .\vcpkg\vcpkg install harfbuzz:x64-windows + $pkg_path = Join-Path $env:GITHUB_WORKSPACE "vcpkg\installed\x64-windows\lib\pkgconfig" + echo "PKG_CONFIG_PATH=$pkg_path" >> $env:GITHUB_ENV + $bin_path = Join-Path $env:GITHUB_WORKSPACE "vcpkg\installed\x64-windows\bin" + echo "$bin_path" >> $env:GITHUB_PATH + # Actual job - name: Run `cargo make ci-job-test-cargo` run: cargo make ci-job-test-cargo diff --git a/examples/cargo/buffer/Makefile b/examples/cargo/buffer/Makefile index c40b506dc9d..a490e2e29f0 100755 --- a/examples/cargo/buffer/Makefile +++ b/examples/cargo/buffer/Makefile @@ -31,7 +31,7 @@ bin/tutorial_buffer.wasm: rustup target add wasm32-wasip1 --toolchain ${PINNED_CI_NIGHTLY} cargo +${PINNED_CI_NIGHTLY} build --target wasm32-wasip1 --release mkdir -p bin - cp -p "$(CARGO_TARGET_DIR)"/wasm32-wasip1/release/tutorial_buffer.wasm bin/ + cp -p "$(CARGO_TARGET_DIR)/wasm32-wasip1/release/tutorial_buffer.wasm" bin/ ls -l bin/ buffer_data.postcard: ../bin/icu4x-datagen$(BINARY_EXT) bin/tutorial_buffer$(BINARY_EXT)