Skip to content

Commit

Permalink
Merge branch 'master' into scope_work
Browse files Browse the repository at this point in the history
  • Loading branch information
pmd3d committed May 5, 2024
2 parents d35801c + babac13 commit 3137987
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
toolchain: ${{ matrix.version.version }}

- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/install-action@v2.32.17
uses: taiki-e/install-action@v2.33.12
with:
tool: cargo-hack,cargo-ci-cache-clean

Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0

- name: Install cargo-hack
uses: taiki-e/install-action@v2.32.17
uses: taiki-e/install-action@v2.33.12
with:
tool: cargo-hack

Expand All @@ -109,7 +109,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0

- name: Install nextest
uses: taiki-e/install-action@v2.32.17
uses: taiki-e/install-action@v2.33.12
with:
tool: nextest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
toolchain: ${{ matrix.version.version }}

- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/install-action@v2.32.17
uses: taiki-e/install-action@v2.33.12
with:
tool: cargo-hack,cargo-ci-cache-clean

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
components: llvm-tools-preview

- name: Install cargo-llvm-cov
uses: taiki-e/install-action@v2.32.17
uses: taiki-e/install-action@v2.33.12
with:
tool: cargo-llvm-cov

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
with:
toolchain: nightly-2023-08-25
toolchain: nightly-2024-04-26

- name: Install cargo-public-api
uses: taiki-e/install-action@v2.32.17
uses: taiki-e/install-action@v2.33.12
with:
tool: cargo-public-api

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: echo '<meta http-equiv="refresh" content="0;url=actix_web/index.html">' > target/doc/index.html

- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.5.0
uses: JamesIves/github-pages-deploy-action@v4.6.0
with:
folder: target/doc
single-commit: true

0 comments on commit 3137987

Please sign in to comment.