Skip to content

Commit

Permalink
Merge pull request #1463 from patmuk/fixes-#1454-by-setting-the-MSRV
Browse files Browse the repository at this point in the history
Fixes #1454 by setting the msrv
  • Loading branch information
fzyzcjy authored Dec 28, 2023
2 parents 2cf7d17 + a880abe commit 499ae26
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 4 deletions.
36 changes: 32 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,30 @@ jobs:
- run: ./frb_internal lint-dart

# ----------------------------------- codegen -----------------------------------
# instead of running this explicit test for frb_codegen and frb_rust only, we run the test for
# all rust packages in the job "test_rust". While this would not be needed for these other packages,
# we avoid a ci dependency to cargo-msrv.
# However, the code is left commented here in case this decission changes.
# msrv:
# name: 'Test :: FRB Codegen :: MSRV'
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2

# - name: Install Rust
# uses: actions-rs/toolchain@v1
# with:
# toolchain: stable

# - name: Verify MSRV for frb_codegen
# run: |
# cargo install cargo-msrv
# cargo msrv --path frb_codegen verify

# - name: Verify MSRV for frb_rust
# run: |
# cargo install cargo-msrv
# cargo msrv --path frb_rust verify

generate_run_frb_codegen_command_generate:
name: 'Generate :: FRB Codegen :: Command Generate'
Expand Down Expand Up @@ -155,7 +179,7 @@ jobs:
flutter-version: ${{ env.FRB_MAIN_FLUTTER_VERSION }}
architecture: x64
- uses: taiki-e/install-action@cargo-llvm-cov

# execute
- run: ./frb_internal generate-run-frb-codegen-command-generate --set-exit-if-changed --package ${{ matrix.package }} --coverage

Expand Down Expand Up @@ -379,7 +403,11 @@ jobs:
version: nightly
- image: ubuntu-latest
version: nightly-2023-12-16
# TODO(@fzyzcjy, @gutenfries): add MSRV here, as well as other locked versions as needed
# tests the MSRV
# run on all rust packages, though only needed for frb_rust and frb_codegen
- image: ubuntu-latest
# update this, if a later MSRV is needed
version: 1.74.0

steps:
# setup
Expand Down Expand Up @@ -407,8 +435,8 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}--${{ matrix.info.image }}--${{ matrix.info.version }}--coverage
path: target/coverage

path: target/coverage
test_dart_native:
name: 'Test :: Dart :: Native'
runs-on: ${{ matrix.image }}
Expand Down
1 change: 1 addition & 0 deletions frb_codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
categories.workspace = true
description.workspace = true
edition.workspace = true
rust-version = "1.74.0"
keywords.workspace = true
license.workspace = true
name = "flutter_rust_bridge_codegen"
Expand Down
1 change: 1 addition & 0 deletions frb_rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "flutter_rust_bridge"
edition.workspace = true
rust-version = "1.70.0"
version.workspace = true
description.workspace = true
license.workspace = true
Expand Down

0 comments on commit 499ae26

Please sign in to comment.