From 276d17ce8f2cbc08934bc9e7d9a640440a2095bc Mon Sep 17 00:00:00 2001 From: graelo Date: Sun, 24 Oct 2021 09:33:55 +0200 Subject: [PATCH] chore(ci): update mrsv to 1.56.0 (edition = 2021) --- .github/workflows/ci.yaml | 4 +-- .github/workflows/main.yaml | 2 +- .github/workflows/pr.yaml | 4 +-- .github/workflows/rust-ci.yml | 51 ----------------------------------- README.md | 3 ++- ci/rustup.sh | 2 +- ci/test_full.sh | 2 +- 7 files changed, 9 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/rust-ci.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bd8c853..e87a05c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.50.0, stable, beta, nightly] + rust: [1.56.0, stable, beta, nightly] steps: - name: Rust install uses: actions-rs/toolchain@v1 @@ -61,7 +61,7 @@ jobs: - name: Rust install uses: actions-rs/toolchain@v1 with: - toolchain: 1.50.0 + toolchain: 1.56.0 profile: minimal override: true components: rustfmt diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d0e284a..26b2924 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.50.0, stable] + rust: [1.56.0, stable] steps: - name: Rust install uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 8f67570..e9a4e82 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.50.0, stable] + rust: [1.56.0, stable] steps: - name: Rust install uses: actions-rs/toolchain@v1 @@ -33,7 +33,7 @@ jobs: - name: Rust install uses: actions-rs/toolchain@v1 with: - toolchain: 1.42.0 + toolchain: 1.56.0 profile: minimal override: true components: rustfmt diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml deleted file mode 100644 index 4169ec6..0000000 --- a/.github/workflows/rust-ci.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Rust CI - -on: - push: - branches: - - '*' - pull_request: - branches: - - 'master' - -env: - CARGO_TERM_COLOR: always - -jobs: - build-mac: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - - name: Build - run: cargo build --release - - - name: Run tests - run: cargo test --verbose - - - uses: actions/upload-artifact@v2 - with: - name: copyrat-macos.zip - path: ./target/release/*copyrat - - - build-linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Install dependencies - run: | - sudo apt update -y - sudo apt-get install -y curl gnupg ca-certificates git gcc-multilib g++-multilib cmake libssl-dev pkg-config python - - - name: Build - run: cargo build --release - - - name: Run tests - run: cargo test --verbose - - - uses: actions/upload-artifact@v2 - with: - name: copyrat-linux.zip - path: ./target/release/*copyrat diff --git a/README.md b/README.md index 2bc4de1..fcb8f99 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ [![crate](https://img.shields.io/crates/v/tmux-copyrat.svg)](https://crates.io/crates/tmux-copyrat) [![documentation](https://docs.rs/tmux-copyrat/badge.svg)](https://docs.rs/tmux-copyrat) -[![minimum rustc 1.8](https://img.shields.io/badge/rustc-1.50+-red.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html) +[![minimum rustc 1.8](https://img.shields.io/badge/rustc-1.56+-red.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html) +[![minimum rustc 1.8](https://img.shields.io/badge/edition-2021-blue.svg)](https://doc.rust-lang.org/edition-guide/rust-2021/index.html) [![build status](https://github.com/graelo/tmux-copyrat/workflows/main/badge.svg)](https://github.com/graelo/tmux-copyrat/actions) diff --git a/ci/rustup.sh b/ci/rustup.sh index f70cda2..5289138 100755 --- a/ci/rustup.sh +++ b/ci/rustup.sh @@ -5,6 +5,6 @@ set -ex ci=$(dirname $0) -for version in 1.50.0 stable beta nightly; do +for version in 1.56.0 stable beta nightly; do rustup run "$version" "$ci/test_full.sh" done diff --git a/ci/test_full.sh b/ci/test_full.sh index b2f5a6c..a7356bf 100755 --- a/ci/test_full.sh +++ b/ci/test_full.sh @@ -3,7 +3,7 @@ set -e CRATE=tmux-copyrat -MSRV=1.50 +MSRV=1.56 get_rust_version() { local array=($(rustc --version));