From 0deb9f9ad667a14aa1b09d003832aabceabae51a Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sat, 3 Apr 2021 00:09:58 -0500 Subject: [PATCH 1/6] Add minimum rust version support in workflow --- .github/workflows/ci.yml | 48 +++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afb75b47..d2188683 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,15 @@ on: - master jobs: - build: - runs-on: ubuntu-latest + tests: + name: Run tests - Rust (${{ matrix.rust }}) on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - { rust: stable, os: ubuntu-latest } + - { rust: 1.49.0, os: ubuntu-latest } steps: - name: Checkout uses: actions/checkout@v2 @@ -18,7 +25,7 @@ jobs: submodules: true - uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: ${{ matrix.rust }} override: true components: clippy, rustfmt - name: Check format @@ -34,7 +41,24 @@ jobs: - name: Clean run: cargo clean - # examples + examples: + name: Build examples - Rust (${{ matrix.rust }}) on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - { rust: stable, os: ubuntu-latest } + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + components: clippy, rustfmt - name: Check examples format run: cargo fmt --all -- --check working-directory: ./examples @@ -48,10 +72,22 @@ jobs: run: cargo clean working-directory: ./examples - # build on nightly + build-nightly: + name: Build nightly - Rust (${{ matrix.rust }}) on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - { rust: nightly, os: ubuntu-latest } + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true - uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: ${{ matrix.rust }} override: true components: clippy, rustfmt - name: Build on nightly with all features From 748a6b41a6afc96eed750e1ee70c2a96a90b5cbd Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sat, 3 Apr 2021 00:11:23 -0500 Subject: [PATCH 2/6] Update README with proper version of Rust that is baseline --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23d2cf5b..83dac801 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ * [Docs](https://docs.rs/async-graphql) * [GitHub repository](https://github.com/async-graphql/async-graphql) * [Cargo package](https://crates.io/crates/async-graphql) -* Minimum supported Rust version: 1.46 or later +* Minimum supported Rust version: 1.49.0 or later ## Safety From 68c74c3eb8318aef1a8a72afde1b05e68ca02dbf Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sat, 3 Apr 2021 00:17:31 -0500 Subject: [PATCH 3/6] Bump 1.49.0 -> 1.50.0 --- .github/workflows/ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2188683..39c50c9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: include: - { rust: stable, os: ubuntu-latest } - - { rust: 1.49.0, os: ubuntu-latest } + - { rust: 1.50.0, os: ubuntu-latest } steps: - name: Checkout uses: actions/checkout@v2 diff --git a/README.md b/README.md index 83dac801..e07934ce 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ * [Docs](https://docs.rs/async-graphql) * [GitHub repository](https://github.com/async-graphql/async-graphql) * [Cargo package](https://crates.io/crates/async-graphql) -* Minimum supported Rust version: 1.49.0 or later +* Minimum supported Rust version: 1.50.0 or later ## Safety From 3eb45cbb3e215a0464f004b84ea0f23df3607183 Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sat, 3 Apr 2021 00:23:45 -0500 Subject: [PATCH 4/6] Bump 1.50.0 -> 1.51.0 --- .github/workflows/ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39c50c9e..39f5716c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: include: - { rust: stable, os: ubuntu-latest } - - { rust: 1.50.0, os: ubuntu-latest } + - { rust: 1.51.0, os: ubuntu-latest } steps: - name: Checkout uses: actions/checkout@v2 diff --git a/README.md b/README.md index e07934ce..c351ba6f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ * [Docs](https://docs.rs/async-graphql) * [GitHub repository](https://github.com/async-graphql/async-graphql) * [Cargo package](https://crates.io/crates/async-graphql) -* Minimum supported Rust version: 1.50.0 or later +* Minimum supported Rust version: 1.51.0 or later ## Safety From 8aa670a9cd303469bd1f00e377f0aeaf9f9904c4 Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sat, 3 Apr 2021 00:34:27 -0500 Subject: [PATCH 5/6] Move back to 1.49.0 by splitting off rustfmt and clippy to only run on stable --- .github/workflows/ci.yml | 50 ++++++++++++++++++++++++++++++++++------ README.md | 2 +- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39f5716c..a9148a50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: include: - { rust: stable, os: ubuntu-latest } - - { rust: 1.51.0, os: ubuntu-latest } + - { rust: 1.49.0, os: ubuntu-latest } steps: - name: Checkout uses: actions/checkout@v2 @@ -27,11 +27,6 @@ jobs: with: toolchain: ${{ matrix.rust }} override: true - components: clippy, rustfmt - - name: Check format - run: cargo fmt --all -- --check - - name: Check with clippy - run: cargo clippy --all - name: Build with all features run: cargo build --all-features - name: Build @@ -41,6 +36,48 @@ jobs: - name: Clean run: cargo clean + rustfmt: + name: Run rustfmt - Rust (${{ matrix.rust }}) on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - { rust: stable, os: ubuntu-latest } + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + components: rustfmt + - name: Check format + run: cargo fmt --all -- --check + + clippy: + name: Run clippy - Rust (${{ matrix.rust }}) on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - { rust: stable, os: ubuntu-latest } + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + components: clippy + - name: Check with clippy + run: cargo clippy --all + examples: name: Build examples - Rust (${{ matrix.rust }}) on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -89,7 +126,6 @@ jobs: with: toolchain: ${{ matrix.rust }} override: true - components: clippy, rustfmt - name: Build on nightly with all features run: cargo build --all-features - name: Build on nightly diff --git a/README.md b/README.md index c351ba6f..83dac801 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ * [Docs](https://docs.rs/async-graphql) * [GitHub repository](https://github.com/async-graphql/async-graphql) * [Cargo package](https://crates.io/crates/async-graphql) -* Minimum supported Rust version: 1.51.0 or later +* Minimum supported Rust version: 1.49.0 or later ## Safety From 93d04870e43e88ddb523db3d13e3b99922f06553 Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sat, 3 Apr 2021 00:39:18 -0500 Subject: [PATCH 6/6] Bump back to 1.50.0 due to unstable library feature unsafe_cell_get_mut in state library --- .github/workflows/ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9148a50..873062c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: include: - { rust: stable, os: ubuntu-latest } - - { rust: 1.49.0, os: ubuntu-latest } + - { rust: 1.50.0, os: ubuntu-latest } steps: - name: Checkout uses: actions/checkout@v2 diff --git a/README.md b/README.md index 83dac801..e07934ce 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ * [Docs](https://docs.rs/async-graphql) * [GitHub repository](https://github.com/async-graphql/async-graphql) * [Cargo package](https://crates.io/crates/async-graphql) -* Minimum supported Rust version: 1.49.0 or later +* Minimum supported Rust version: 1.50.0 or later ## Safety