Skip to content

Commit

Permalink
Update Workflow (#58)
Browse files Browse the repository at this point in the history
  • Loading branch information
futursolo authored Dec 2, 2022
1 parent 017a63d commit 72093e1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 63 deletions.
67 changes: 13 additions & 54 deletions .github/workflows/everything.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,14 @@ jobs:
fetch-depth: 0

- name: Setup Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
targets: wasm32-unknown-unknown
components: rustfmt, clippy
profile: minimal

- name: Restore Rust Cache
uses: Swatinem/rust-cache@v2

- name: Setup Rust wasm
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
profile: minimal

- name: Install cargo-make
uses: davidB/rust-cargo-make@v1

Expand All @@ -47,23 +38,14 @@ jobs:
fetch-depth: 0

- name: Setup Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
targets: wasm32-unknown-unknown
components: rustfmt, clippy
profile: minimal

- name: Restore Rust Cache
uses: Swatinem/rust-cache@v2

- name: Setup Rust wasm
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
profile: minimal

- name: Setup trunk
uses: jetli/[email protected]
with:
Expand All @@ -86,23 +68,14 @@ jobs:
fetch-depth: 0

- name: Setup Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
targets: wasm32-unknown-unknown
components: rustfmt, clippy
profile: minimal

- name: Restore Rust Cache
uses: Swatinem/rust-cache@v2

- name: Setup Rust wasm
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
profile: minimal

- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

Expand All @@ -127,31 +100,23 @@ jobs:
fetch-depth: 0

- name: Setup Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
targets: wasm32-unknown-unknown
components: rustfmt, clippy
profile: minimal


- name: Restore Rust Cache
uses: Swatinem/rust-cache@v2

- name: Run cargo publish --dry-run for bounce-macros
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: actions-rs/cargo@v1
with:
command: publish
args: --dry-run --manifest-path crates/bounce-macros/Cargo.toml
run: cargo publish --dry-run --manifest-path crates/bounce-macros/Cargo.toml
env:
RUSTFLAGS: "--cfg releasing"

- name: Run cargo publish for bounce-macros
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
uses: actions-rs/cargo@v1
with:
command: publish
args: --token ${{ secrets.CRATES_IO_TOKEN }} --manifest-path crates/bounce-macros/Cargo.toml
run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }} --manifest-path crates/bounce-macros/Cargo.toml
env:
RUSTFLAGS: "--cfg releasing"

Expand All @@ -163,18 +128,12 @@ jobs:
# See: https://github.com/rust-lang/cargo/issues/1169
# - name: Run cargo publish --dry-run for bounce
# if: github.event_name == 'push' && github.ref == 'refs/heads/master'
# uses: actions-rs/cargo@v1
# with:
# command: publish
# args: --dry-run --manifest-path crates/bounce/Cargo.toml
# run: cargo publish --dry-run --manifest-path crates/bounce/Cargo.toml
# env:
# RUSTFLAGS: "--cfg releasing"

- name: Run cargo publish for bounce
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
uses: actions-rs/cargo@v1
with:
command: publish
args: --token ${{ secrets.CRATES_IO_TOKEN }} --manifest-path crates/bounce/Cargo.toml
run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }} --manifest-path crates/bounce/Cargo.toml
env:
RUSTFLAGS: "--cfg releasing"
11 changes: 2 additions & 9 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,13 @@ jobs:
uses: actions/checkout@v3

- name: Setup Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
profile: minimal
uses: dtolnay/rust-toolchain@stable

- name: Restore Rust Cache
uses: Swatinem/rust-cache@v2

- name: Install mdbook
uses: actions-rs/cargo@v1
with:
command: install
args: mdbook
run: cargo install --locked mdbook

- name: Build Website
run: mdbook build
Expand Down

0 comments on commit 72093e1

Please sign in to comment.