Skip to content

Commit

Permalink
Merge branch 'master' into esm-type-and-main-in-package-json
Browse files Browse the repository at this point in the history
  • Loading branch information
gthb committed Nov 14, 2023
2 parents 4ca0f02 + 6bf80bb commit 473dbf8
Show file tree
Hide file tree
Showing 83 changed files with 2,689 additions and 2,857 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ jobs:
name: Build and deploy book
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-mdbook
with:
Expand All @@ -31,7 +30,7 @@ jobs:
- name: Install mdbook
run: |
(test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
(test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.3" mdbook)
(test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4" mdbook)
cargo install-update -a
- name: Build book
Expand All @@ -42,7 +41,7 @@ jobs:
./build-installer
- name: Deploy book
uses: JamesIves/github-pages-deploy-action@4.1.4
uses: JamesIves/github-pages-deploy-action@v4.4.1
if: ${{ github.ref == 'refs/heads/master' }}
with:
branch: gh-pages
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ jobs:
rust: stable

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust }}
override: true
target: wasm32-unknown-unknown
targets: wasm32-unknown-unknown

- name: Query version number
id: get_version
Expand Down Expand Up @@ -96,6 +95,7 @@ jobs:
mv wasm-pack-init.exe ${{ env.RELEASE_DIR }}
- name: Create tarball
shell: bash
run: 7z a -ttar -so -an ./${{ env.RELEASE_DIR }}/${{ env.RELEASE_BIN }}-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }} | 7z a -si ./${{ env.RELEASE_DIR }}/${{ env.RELEASE_BIN }}-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz

- name: Upload Zip
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ jobs:
rust: stable

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: nanasess/setup-chromedriver@master
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust }}
override: true
target: wasm32-unknown-unknown
targets: wasm32-unknown-unknown
- uses: actions/setup-node@v2

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-dependencies
with:
Expand All @@ -52,7 +51,7 @@ jobs:
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Cargo.lock') }}

- name: Run Tests
run: cargo test --features "strict" --all --locked
run: cargo test --all --locked
env:
RUST_BACKTRACE: 1

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ tests/bin
/build-installer
docs/book
docs/installer

.idea

0 comments on commit 473dbf8

Please sign in to comment.