From 7e0e25f91ac306760e8f546901737c8cf7f697e6 Mon Sep 17 00:00:00 2001 From: Kaede Hoshikawa Date: Sun, 4 Dec 2022 23:17:49 +0900 Subject: [PATCH] Update GitHub Actions (#2998) * Update Workflow. * Fix Workflows. * Enables dependabot for github actions. * Fix workflow. --- .github/dependabot.yml | 6 ++ .github/workflows/benchmark-ssr.yml | 5 +- .github/workflows/benchmark.yml | 7 +- .github/workflows/build-api-docs.yml | 18 +++-- .github/workflows/fmt.yml | 12 +-- .github/workflows/inspect-next-changelogs.yml | 6 +- .github/workflows/main-checks.yml | 79 +++++++------------ .github/workflows/publish-examples.yml | 8 +- .github/workflows/publish-yew-agent.yml | 6 +- .github/workflows/publish-yew-only.yml | 6 +- .github/workflows/publish-yew-router-only.yml | 6 +- .github/workflows/publish-yew-router.yml | 6 +- .github/workflows/publish-yew.yml | 6 +- .github/workflows/size-cmp.yml | 6 +- .github/workflows/tools-examples.yml | 16 ++-- examples/Cargo.lock | 10 +-- 16 files changed, 82 insertions(+), 121 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2a612b5cb4c..4637a948c80 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,3 +26,9 @@ updates: schedule: interval: "monthly" target-branch: "master" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + target-branch: "master" diff --git a/.github/workflows/benchmark-ssr.yml b/.github/workflows/benchmark-ssr.yml index a5ebe1e6b2d..e95777381ce 100644 --- a/.github/workflows/benchmark-ssr.yml +++ b/.github/workflows/benchmark-ssr.yml @@ -32,11 +32,10 @@ jobs: path: current-pr - name: Setup toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@master with: toolchain: stable - target: wasm32-unknown-unknown - profile: minimal + targets: wasm32-unknown-unknown - name: Restore Rust cache for master uses: Swatinem/rust-cache@v1 diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 36102aa4f92..6622f36db93 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -65,12 +65,11 @@ jobs: path: "./js-framework-benchmark" ref: 678cd09a8e02b9a01bcb9b71dc9248d17a33ff82 - - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - target: wasm32-unknown-unknown - override: true - profile: minimal + targets: wasm32-unknown-unknown - uses: jetli/wasm-pack-action@v0.3.0 with: diff --git a/.github/workflows/build-api-docs.yml b/.github/workflows/build-api-docs.yml index 376eb1cd0e0..a6e0b4f66b8 100644 --- a/.github/workflows/build-api-docs.yml +++ b/.github/workflows/build-api-docs.yml @@ -21,20 +21,24 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: nightly - override: true - profile: minimal components: rust-docs - name: Run cargo doc - uses: actions-rs/cargo@v1 env: RUSTDOCFLAGS: --cfg documenting --html-before-content ./api-docs/before-content.html --extend-css ./api-docs/styles.css -Z unstable-options --enable-index-page - with: - command: doc - args: -p yew -p yew-macro -p yew-router -p yew-router-macro -p yew-agent --no-deps --all-features + run: | + cargo doc \ + --no-deps \ + --all-features \ + -p yew \ + -p yew-macro \ + -p yew-router \ + -p yew-router-macro \ + -p yew-agent - name: Move files in correct directory run: | diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml index 2c8a8b9b495..0b5e2df4a22 100644 --- a/.github/workflows/fmt.yml +++ b/.github/workflows/fmt.yml @@ -14,16 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: nightly - override: true - profile: minimal components: rustfmt - name: Run fmt - uses: actions-rs/cargo@v1 - with: - command: fmt - toolchain: nightly - args: --all -- --check + run: cargo +nightly fmt --all -- --check --unstable-features diff --git a/.github/workflows/inspect-next-changelogs.yml b/.github/workflows/inspect-next-changelogs.yml index ddfe47a91d3..325a4a6f117 100644 --- a/.github/workflows/inspect-next-changelogs.yml +++ b/.github/workflows/inspect-next-changelogs.yml @@ -16,12 +16,10 @@ jobs: with: fetch-depth: 0 - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - name: Build changelog generator run: cargo build --release -p changelog diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index bcf986342e3..d96fb67b4b6 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -22,20 +22,17 @@ jobs: - release steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal components: clippy - uses: Swatinem/rust-cache@v1 - name: Run clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all-targets --all-features --profile ${{ matrix.profile }} -- -D warnings + run: cargo clippy --all-targets --all-features --profile ${{ matrix.profile }} -- -D warnings - name: Lint feature soundness if: matrix.profile == 'dev' @@ -64,48 +61,39 @@ jobs: - uses: actions/checkout@v2 - uses: Swatinem/rust-cache@v1 - - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - # perhaps extract it into its own little action? - - uses: actions-rs/toolchain@v1 - # for wasm-bindgen-cli, always use stable rust + # for wasm-bindgen-cli, always use stable rust + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - profile: minimal - name: Install wasm-bindgen-cli shell: bash run: ./ci/install-wasm-bindgen-cli.sh - - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: nightly - target: wasm32-unknown-unknown - override: true - profile: minimal + targets: wasm32-unknown-unknown - uses: browser-actions/setup-geckodriver@latest - uses: nanasess/setup-chromedriver@v1 - name: Run doctest - uses: actions-rs/cargo@v1 - with: - command: test - args: --doc --workspace --exclude yew --target wasm32-unknown-unknown + run: cargo test --doc --workspace --exclude yew --target wasm32-unknown-unknown - name: Run website code snippet tests run: cargo test -p website-test --target wasm32-unknown-unknown working-directory: tools - name: Run doctest - yew with features - uses: actions-rs/cargo@v1 - with: - command: test - args: -p yew --doc --all-features --target wasm32-unknown-unknown + run: cargo test -p yew --doc --all-features --target wasm32-unknown-unknown integration_tests: name: Integration Tests on ${{ matrix.toolchain }} @@ -123,22 +111,21 @@ jobs: - uses: Swatinem/rust-cache@v1 - - uses: actions-rs/toolchain@v1 - # for wasm-bindgen-cli, always use stable rust + # for wasm-bindgen-cli, always use stable rust + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - profile: minimal - name: Install wasm-bindgen-cli shell: bash run: ./ci/install-wasm-bindgen-cli.sh - - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.toolchain }} - target: wasm32-unknown-unknown - override: true - profile: minimal + targets: wasm32-unknown-unknown - uses: browser-actions/setup-geckodriver@latest - uses: nanasess/setup-chromedriver@v1 @@ -171,33 +158,26 @@ jobs: with: fetch-depth: 0 - - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.toolchain }} - override: true - profile: minimal - uses: Swatinem/rust-cache@v1 - name: Run native tests - uses: actions-rs/cargo@v1 env: # workaround for lack of ternary operator # see https://github.com/orgs/community/discussions/25725 RUSTFLAGS: ${{ matrix.toolchain == 'nightly' && '--cfg nightly_yew' || '' }} - with: - command: test - args: --all-targets --workspace --exclude yew + run: cargo test --all-targets --workspace --exclude yew - name: Run native tests for yew - uses: actions-rs/cargo@v1 env: # workaround for lack of ternary operator # see https://github.com/orgs/community/discussions/25725 RUSTFLAGS: ${{ matrix.toolchain == 'nightly' && '--cfg nightly_yew' || '' }} - with: - command: test - args: -p yew --all-features + run: cargo test -p yew --all-features test-lints: name: Test lints on nightly @@ -205,18 +185,15 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: nightly - override: true - profile: minimal - uses: Swatinem/rust-cache@v1 - name: Run tests - uses: actions-rs/cargo@v1 env: RUSTFLAGS: --cfg nightly_yew --cfg yew_lints - with: - command: test - args: -p yew-macro test_html_lints + run: cargo test -p yew-macro test_html_lints diff --git a/.github/workflows/publish-examples.yml b/.github/workflows/publish-examples.yml index 98f5cca97e8..e3f9be8bdcd 100644 --- a/.github/workflows/publish-examples.yml +++ b/.github/workflows/publish-examples.yml @@ -16,13 +16,13 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: nightly - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown components: rust-src - override: true - profile: minimal - uses: Swatinem/rust-cache@v1 diff --git a/.github/workflows/publish-yew-agent.yml b/.github/workflows/publish-yew-agent.yml index acaec677174..fc504b8e89b 100644 --- a/.github/workflows/publish-yew-agent.yml +++ b/.github/workflows/publish-yew-agent.yml @@ -29,12 +29,10 @@ jobs: with: token: "${{ secrets.YEWTEMPBOT_TOKEN }}" - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - name: Install cargo binary dependencies uses: baptiste0928/cargo-install@v1 diff --git a/.github/workflows/publish-yew-only.yml b/.github/workflows/publish-yew-only.yml index 27173544f59..cec566eaf1a 100644 --- a/.github/workflows/publish-yew-only.yml +++ b/.github/workflows/publish-yew-only.yml @@ -30,12 +30,10 @@ jobs: with: token: "${{ secrets.YEWTEMPBOT_TOKEN }}" - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - name: Install cargo binary dependencies uses: baptiste0928/cargo-install@v1 diff --git a/.github/workflows/publish-yew-router-only.yml b/.github/workflows/publish-yew-router-only.yml index 994284e8b36..2cd74a55937 100644 --- a/.github/workflows/publish-yew-router-only.yml +++ b/.github/workflows/publish-yew-router-only.yml @@ -29,12 +29,10 @@ jobs: with: token: "${{ secrets.YEWTEMPBOT_TOKEN }}" - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - name: Install cargo binary dependencies uses: baptiste0928/cargo-install@v1 diff --git a/.github/workflows/publish-yew-router.yml b/.github/workflows/publish-yew-router.yml index db9c252dda0..0f006d6752c 100644 --- a/.github/workflows/publish-yew-router.yml +++ b/.github/workflows/publish-yew-router.yml @@ -29,12 +29,10 @@ jobs: with: token: "${{ secrets.YEWTEMPBOT_TOKEN }}" - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - name: Install cargo binary dependencies uses: baptiste0928/cargo-install@v1 diff --git a/.github/workflows/publish-yew.yml b/.github/workflows/publish-yew.yml index 19b30ff2ac3..58c4be06e41 100644 --- a/.github/workflows/publish-yew.yml +++ b/.github/workflows/publish-yew.yml @@ -29,12 +29,10 @@ jobs: with: token: "${{ secrets.YEWTEMPBOT_TOKEN }}" - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - profile: minimal - name: Install cargo binary dependencies uses: baptiste0928/cargo-install@v1 diff --git a/.github/workflows/size-cmp.yml b/.github/workflows/size-cmp.yml index 2d4053602d5..5f568a426c0 100644 --- a/.github/workflows/size-cmp.yml +++ b/.github/workflows/size-cmp.yml @@ -30,13 +30,11 @@ jobs: path: current-pr - name: Setup toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@master with: toolchain: nightly - target: wasm32-unknown-unknown components: rust-src - override: true - profile: minimal + targets: wasm32-unknown-unknown - name: Restore Rust cache for master uses: Swatinem/rust-cache@v1 diff --git a/.github/workflows/tools-examples.yml b/.github/workflows/tools-examples.yml index 40a5b2d6aa4..ee8a1b4cd1c 100644 --- a/.github/workflows/tools-examples.yml +++ b/.github/workflows/tools-examples.yml @@ -31,25 +31,19 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.toolchain }} - override: true - profile: minimal components: ${{ matrix.runs }} - uses: Swatinem/rust-cache@v1 - name: Run clippy for ${{ matrix.workspace }} if: matrix.runs == 'clippy' - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all-targets --all-features --manifest-path ${{ matrix.workspace }}/Cargo.toml -- -D warnings + run: cargo clippy --all-targets --all-features --manifest-path ${{ matrix.workspace }}/Cargo.toml -- -D warnings - name: Run fmt for ${{ matrix.workspace }} if: matrix.runs == 'rustfmt' - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all --manifest-path ${{ matrix.workspace }}/Cargo.toml -- --check + run: cargo fmt --all --manifest-path ${{ matrix.workspace }}/Cargo.toml -- --check diff --git a/examples/Cargo.lock b/examples/Cargo.lock index 1936e732bdd..ceeb463a0a8 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -2876,7 +2876,7 @@ dependencies = [ [[package]] name = "yew" -version = "0.19.3" +version = "0.20.0" dependencies = [ "base64ct", "bincode", @@ -2902,7 +2902,7 @@ dependencies = [ [[package]] name = "yew-agent" -version = "0.1.0" +version = "0.2.0" dependencies = [ "gloo-worker 0.1.2", "yew", @@ -2910,7 +2910,7 @@ dependencies = [ [[package]] name = "yew-macro" -version = "0.19.3" +version = "0.20.0" dependencies = [ "boolinator", "once_cell", @@ -2923,7 +2923,7 @@ dependencies = [ [[package]] name = "yew-router" -version = "0.16.0" +version = "0.17.0" dependencies = [ "gloo", "js-sys", @@ -2939,7 +2939,7 @@ dependencies = [ [[package]] name = "yew-router-macro" -version = "0.16.0" +version = "0.17.0" dependencies = [ "proc-macro2", "quote",