Skip to content

Commit

Permalink
Use old cargo-hack for 1.59.0 CI (#472)
Browse files Browse the repository at this point in the history
* Use old cargo-hack for 1.57.0 CI

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

* Upgrade MSRV to 1.59.0

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
Co-authored-by: Rob Ede <robjtede@icloud.com>
  • Loading branch information
JohnTitor and robjtede committed Nov 12, 2022
1 parent 8e9401f commit 2b83f08
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 16 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
- { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
version:
- 1.57.0
- 1.59.0
- stable

name: ${{ matrix.target.name }} / ${{ matrix.version }}
Expand Down Expand Up @@ -68,10 +68,13 @@ jobs:
# uses: Swatinem/rust-cache@v1.2.0

- name: Install cargo-hack
uses: actions-rs/cargo@v1
with:
command: install
args: cargo-hack
if: matrix.version != '1.59.0'
run: cargo install cargo-hack

# newer cargo-hack versions require 1.60 or above
- name: Install cargo-hack (1.59.0)
if: matrix.version == '1.59.0'
run: cargo install cargo-hack --version=0.5.21

- name: Generate Cargo.lock
uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -123,7 +126,7 @@ jobs:
sudo bash -c "ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux"
- name: Clear the cargo caches
if: matrix.version == 'stable' # MSRV(1.58) cargo-cache now fails to install on 1.57
if: matrix.version == 'stable' # MSRV(1.58) cargo-cache now fails to install on 1.59
run: |
cargo install cargo-cache --version 0.6.2 --no-default-features --features ci-autoclean
cargo-cache
Expand Down
2 changes: 1 addition & 1 deletion actix-codec/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 0.5.1 - 2022-03-15
Expand Down
2 changes: 1 addition & 1 deletion actix-macros/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 0.2.3 - 2021-10-19
Expand Down
2 changes: 1 addition & 1 deletion actix-rt/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Unreleased - 2022-xx-xx
- Add `#[track_caller]` attribute to `spawn` functions and methods. [#454]
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.

[#454]: https://github.com/actix/actix-net/pull/454

Expand Down
2 changes: 1 addition & 1 deletion actix-server/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 2.1.1 - 2022-03-09
Expand Down
2 changes: 1 addition & 1 deletion actix-service/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 2.0.2 - 2021-12-18
Expand Down
2 changes: 1 addition & 1 deletion actix-tls/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 3.0.4 - 2022-03-15
Expand Down
2 changes: 1 addition & 1 deletion actix-tracing/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 0.1.0 - 2020-01-15
Expand Down
1 change: 1 addition & 0 deletions actix-utils/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.


## 3.0.1 - 2022-10-21
Expand Down
1 change: 1 addition & 0 deletions bytestring/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.


## 1.2.1 - 2022-11-12
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.57"
msrv = "1.59"
2 changes: 1 addition & 1 deletion local-channel/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 0.1.3 - 2022-05-03
Expand Down
2 changes: 1 addition & 1 deletion local-waker/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
- Minimum supported Rust version (MSRV) is now 1.59.


## 0.1.3 - 2022-05-03
Expand Down

0 comments on commit 2b83f08

Please sign in to comment.