Skip to content

Commit

Permalink
Merge branch 'main' into collatorresolvedoptions
Browse files Browse the repository at this point in the history
  • Loading branch information
hsivonen committed Nov 7, 2023
2 parents fb2dda8 + 236ec1b commit ceb22bc
Show file tree
Hide file tree
Showing 6,600 changed files with 354,189 additions and 217,884 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
19 changes: 0 additions & 19 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,6 @@
# (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).

[alias]

quick = "make quick"
tidy = "make tidy"

# Run Clippy on all code paths
# Keep args in sync with `clippy` job in .github/workflows/build-test.yml
clippy-all = "clippy --all-features --all-targets -- -D warnings"

# Build configuration for small binary size
panic-abort-build = "build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort"

wasm-build-release = "panic-abort-build --target wasm32-unknown-unknown --profile=release-opt-size"

[target.wasm32-unknown-unknown]
rustflags = [
# 100 KiB, working around a bug in older rustc
# https://github.com/unicode-org/icu4x/issues/2753
# keep in sync with wasm's and tinywasm's build.sh
"-C", "link-args=-z stack-size=100000",
"-C", "panic=abort",
"-C", "opt-level=s"
]
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.postcard binary
*/**/README.md linguist-generated=true
*.rs.data linguist-language=Rust
50 changes: 23 additions & 27 deletions .github/workflows/artifacts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
needs: credentials
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main or forked repository (needs credentials)
- id: gcp-auth
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
needs: credentials
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main or forked repository (needs credentials)
- id: gcp-auth
Expand All @@ -122,19 +122,19 @@ jobs:
- name: Build CPP docs
run: |
cd ffi/diplomat/cpp/docs
cd ffi/capi/cpp/docs
make html
cd ../../../..
- name: Build JS docs
run: |
cd ffi/diplomat/js/docs
cd ffi/capi/js/package/docs
make html
cd ../../../..
- name: Upload docs to Google Cloud Storage
run: |
gsutil -m cp -r ffi/diplomat/cpp/docs/build/html gs://${{ env.GCP_PR_BUCKET_ID }}/gha/${{ github.sha }}/ffi/cpp
gsutil -m cp -r ffi/diplomat/js/docs/build/html gs://${{ env.GCP_PR_BUCKET_ID }}/gha/${{ github.sha }}/ffi/js
gsutil -m cp -r ffi/capi/cpp/docs/build/html gs://${{ env.GCP_PR_BUCKET_ID }}/gha/${{ github.sha }}/ffi/cpp
gsutil -m cp -r ffi/capi/js/package/docs/build/html gs://${{ env.GCP_PR_BUCKET_ID }}/gha/${{ github.sha }}/ffi/js
- name: "⭐⭐⭐ Links to Uploaded Artifacts ⭐⭐⭐"
run: |
echo "::group::📖 CPP Docs Preview"
Expand All @@ -151,7 +151,7 @@ jobs:
name: WASM Demo
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main repository
- id: gcp-auth
Expand All @@ -170,32 +170,27 @@ jobs:
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Init node package
- name: Init packages
run: |
cd ffi/diplomat/js/examples/node
make
cd ../wasm-demo
npm ci
npm -C ffi/capi/js/package ci
npm -C ffi/capi/js/examples/wasm-demo ci
- name: Run Webpack
run: |
cd ffi/diplomat/js/examples/wasm-demo
npm run build
run: npm -C ffi/capi/js/examples/wasm-demo run build

- name: Put index.html in dist for temp URL
run: |
cp ffi/diplomat/js/examples/wasm-demo/index.html ffi/diplomat/js/examples/wasm-demo/dist/index.html
printf "const gcs=document.createElement('script');gcs.setAttribute('src','./bundle.js');document.body.appendChild(gcs);" > ffi/diplomat/js/examples/wasm-demo/dist/index.js
cp ffi/capi/js/examples/wasm-demo/index.html ffi/capi/js/examples/wasm-demo/dist/index.html
printf "const gcs=document.createElement('script');gcs.setAttribute('src','./bundle.js');document.body.appendChild(gcs);" > ffi/capi/js/examples/wasm-demo/dist/index.js
- name: Upload wasm-demo bundle to Google Cloud Storage
run: |
gsutil -m cp -r ffi/diplomat/js/examples/wasm-demo/dist/* gs://${{ env.GCP_MAIN_BUCKET_ID }}/gha/wasm-demo
gsutil -m cp -r ffi/capi/js/examples/wasm-demo/dist/* gs://${{ env.GCP_MAIN_BUCKET_ID }}/gha/wasm-demo
- name: "⭐⭐⭐ Links to Uploaded Artifacts ⭐⭐⭐"
run: |
echo "::group::Wasm Demo Preview"
echo "Wasm Demo Preview"
echo "https://storage.googleapis.com/${{ env.GCP_MAIN_BUCKET_ID }}/gha/wasm-demo/index.html"
echo "::endgroup::"
bench-perf:
# This is too expensive to run on every push, so only run it on main.
Expand All @@ -214,6 +209,7 @@ jobs:
- components/segmenter
- experimental/transliterate
- experimental/zerotrie
- provider/blob
- utils/fixed_decimal
- utils/litemap
- utils/tinystr
Expand All @@ -228,7 +224,7 @@ jobs:
# Example "debugging" workflow: https://github.com/echeran/icu4x/actions/runs/296714990

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main repository
- id: gcp-auth
Expand Down Expand Up @@ -324,7 +320,7 @@ jobs:
group: bench-memory-${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main repository
- id: gcp-auth
Expand Down Expand Up @@ -401,7 +397,7 @@ jobs:
group: bench-binsize

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main repository
- id: gcp-auth
Expand Down Expand Up @@ -519,7 +515,7 @@ jobs:
group: bench-datasize
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# GCP Boilerplate for jobs in main repository
- id: gcp-auth
Expand All @@ -541,7 +537,7 @@ jobs:
- name: Generate testdata
run: |
cargo run --bin make-testdata-legacy
cargo run --bin make-testdata-legacy --manifest-path tools/testdata-scripts/Cargo.toml
- name: Measure size of selected data package provider/testdata/data/testdata.postcard
run: |
Expand All @@ -561,7 +557,7 @@ jobs:
benchmark-data-dir-path: ./benchmarks/datasize
# Tentative setting, optimized value to be determined
alert-threshold: '100%'
fail-on-alert: true
fail-on-alert: false
# comment-on-alert: true
github-token: ${{ secrets.GITHUB_TOKEN }}
gh-pages-branch: empty
Expand All @@ -583,7 +579,7 @@ jobs:
group: "pages"
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# GCP Boilerplate for jobs in main repository
- id: gcp-auth
name: "Authenticate to Google Cloud with Workload Identity Provider"
Expand Down
Loading

0 comments on commit ceb22bc

Please sign in to comment.