Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into olu-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Myriad-Dreamin committed Oct 3, 2024
2 parents 9a5a26a + 3c0f477 commit f540cb3
Show file tree
Hide file tree
Showing 78 changed files with 4,224 additions and 2,630 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
# cp ./chromedriver-linux64/chromedriver /${HOME}/.cargo/bin/
- name: Set up Chrome
run: |
VERSION_STRING="117.0.5938.88-1"
VERSION_STRING="129.0.6668.70-1"
wget "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${VERSION_STRING}_amd64.deb"
sudo dpkg -i "google-chrome-stable_${VERSION_STRING}_amd64.deb"
google-chrome --version
- name: Set up Chrome driver
run: |
wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/117.0.5938.88/linux64/chromedriver-linux64.zip
wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/129.0.6668.70/linux64/chromedriver-linux64.zip
unzip chromedriver-linux64.zip
sudo mv ./chromedriver-linux64/chromedriver /usr/local/bin/chromedriver
chromedriver --version
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
-p typst-ts-cli -p typst-ts-integration-test
- name: Archive Test Results (WebAssembly Renderer in Chrome)
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: wasm-renderer-chrome.test_points.json.gz
path: target/typst-artifacts/integrations/renderer/test_points.chrome.json.gz
2 changes: 1 addition & 1 deletion .github/workflows/gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | bash
- name: Download & install shiroa
run: |
curl -L https://github.com/Myriad-Dreamin/shiroa/releases/download/v0.2.0-nightly1/shiroa-x86_64-unknown-linux-gnu.tar.gz | tar -xvz
curl -L https://github.com/Myriad-Dreamin/shiroa/releases/download/v0.2.0-nightly4/shiroa-x86_64-unknown-linux-gnu.tar.gz | tar -xvz
chmod +x shiroa-x86_64-unknown-linux-gnu/bin/shiroa
sudo cp shiroa-x86_64-unknown-linux-gnu/bin/shiroa /usr/bin/shiroa
- name: Run sccache-cache
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
run: |
cargo build --release --manifest-path cli/Cargo.toml --target ${{ matrix.rust-target }} --bin typst-ts-cli
cargo build --profile relwithdebinfo --manifest-path cli/Cargo.toml --target ${{ matrix.rust-target }} --bin typst-ts-cli
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-${{ env.target }}
path: target/${{ matrix.rust-target }}/release/typst-ts-*
if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-${{ env.target }}-relwithdebuginfo
path: target/${{ matrix.rust-target }}/relwithdebinfo/typst-ts-*
Expand Down Expand Up @@ -125,12 +125,12 @@ jobs:
CARGO_TARGET: ${{ matrix.rust-target }}
PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig
PKG_CONFIG_ALLOW_CROSS: true
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-${{ env.target }}
path: target/${{ matrix.rust-target }}/release/typst-ts-*
if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-${{ env.target }}-relwithdebuginfo
path: target/${{ matrix.rust-target }}/relwithdebinfo/typst-ts-*
Expand Down Expand Up @@ -161,17 +161,17 @@ jobs:
run: |
cargo build --release --manifest-path cli/Cargo.toml --target $RUST_TARGET --bin typst-ts-cli
cargo build --profile relwithdebinfo --manifest-path cli/Cargo.toml --target $RUST_TARGET --bin typst-ts-cli
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-font-assets
path: assets
if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-${{ env.target }}
path: target/${{ env.RUST_TARGET }}/release/typst-ts-*
if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: typst-ts-${{ env.target }}-relwithdebuginfo
path: target/${{ env.RUST_TARGET }}/relwithdebinfo/typst-ts-*
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
tar czvf gh-release/font-assets.tar.gz -C release font-assets
- name: Display structure of releasing files
run: find gh-release
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: gh-release
path: gh-release
Expand Down
Loading

0 comments on commit f540cb3

Please sign in to comment.