Skip to content

Commit

Permalink
ci: Change MSRV check to use 1.84 resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
@FabianLars
FabianLars committed Jan 14, 2025
1 parent b69527b commit d88675b
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 118 deletions.
242 changes: 126 additions & 116 deletions .github/workflows/covector-version-or-publish-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: install rust ${{ matrix.project.toolchain || matrix.platform.toolchain }}
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.project.toolchain || matrix.platform.toolchain }}
target: ${{ matrix.platform.target }}
- name: install rust stable for MSRV check
uses: dtolnay/rust-toolchain@stable

- name: install Linux dependencies
if: contains(matrix.platform.target, 'unknown-linux')
Expand All @@ -59,7 +56,9 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: regen lockfile
- name: regen lockfile using cargo >=1.84
env:
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
run: |
rm Cargo.lock
rm tooling/bundler/Cargo.lock
Expand All @@ -70,118 +69,129 @@ jobs:
cd ../cli
cargo generate-lockfile
- name: Downgrade crates with MSRV conflict (core)
if: ${{ matrix.project.name == 'core' }}
# The --precise flag can only be used once per invocation.
run: |
cargo update -p system-deps:6.2.2 --precise 6.1.1
cargo update -p toml:0.7.8 --precise 0.7.3
cargo update -p toml_edit:0.19.15 --precise 0.19.8
cargo update -p embed-resource --precise 2.3.0
cargo update -p notify-rust --precise 4.10.0
cargo update -p toml_datetime --precise 0.6.1
cargo update -p serde_spanned --precise 0.6.1
cargo update -p winnow --precise 0.4.1
cargo update -p plist --precise 1.5.1
cargo update -p serde_with:3.12.0 --precise 3.0.0
cargo update -p time --precise 0.3.15
cargo update -p ignore --precise 0.4.18
cargo update -p raw-window-handle --precise 0.5.0
cargo update -p cargo_toml:0.15.3 --precise 0.15.2
cargo update -p zbus --precise 3.13.0
cargo update -p zbus_names --precise 2.5.0
cargo update -p colored --precise 2.0.2
cargo update -p arboard --precise 3.2.1
cargo update -p tempfile --precise 3.6.0
cargo update -p tokio --precise 1.29.0
cargo update -p flate2 --precise 1.0.26
cargo update -p hyper --precise 0.14.28
cargo update -p h2 --precise 0.3.20
cargo update -p reqwest --precise 0.11.18
cargo update -p bstr --precise 1.6.2
cargo update -p cfg-expr:0.15.8 --precise 0.15.4
cargo update -p memchr --precise 2.6.2
cargo update -p async-executor --precise 1.5.1
cargo update -p proptest --precise 1.2.0
cargo update -p regex --precise 1.9.6
cargo update -p bstr --precise 1.6.2
cargo update -p backtrace --precise 0.3.68
cargo update -p blocking --precise 1.4.1
cargo update -p ignore --precise 0.4.18
cargo update -p globset --precise 0.4.13
cargo update -p crossbeam-channel --precise 0.5.8
cargo update -p crossbeam-utils --precise 0.8.16
cargo update -p image --precise 0.24.4
cargo update -p async-process --precise 1.7.0
cargo update -p is-terminal --precise 0.4.7
cargo update -p tar --precise 0.4.39
cargo update -p serde_json --precise 1.0.97
cargo update -p petgraph --precise 0.6.3
cargo update -p os_str_bytes --precise 6.5.1
cargo update -p thread_local --precise 1.1.7
cargo update -p cc --precise 1.0.94
cargo update -p tree_magic_mini --precise 3.0.3
cargo update -p tokio-test --precise 0.4.3
cargo update -p tokio-stream --precise 0.1.14
cargo update -p tokio-util --precise 0.7.10
cargo update -p os_pipe --precise 1.1.5
cargo update -p serde --precise 1.0.210
cargo update -p pest_derive --precise 2.7.14
cargo update -p pest_generator --precise 2.7.14
cargo update -p pest_meta --precise 2.7.14
cargo update -p pest --precise 2.7.14
cargo update -p thiserror:1.0.69 --precise 1.0.65
cargo update -p syn:2.0.96 --precise 2.0.67
cargo update -p derive_more --precise 0.99.17
cargo update -p native-tls --precise 0.2.11
cargo update -p ppv-lite86 --precise 0.2.17
cargo update -p xml-rs --precise 0.8.20
cargo update -p mac-notification-sys --precise 0.6.1
cargo update -p security-framework-sys --precise 2.11.1
cargo update -p openssl --precise 0.10.66
cargo update -p openssl-sys --precise 0.9.103
cargo update -p idna_adapter --precise 1.1.0
cargo update -p fdeflate --precise 0.3.5
cargo update -p url --precise 2.5.2
cargo update -p libc --precise 0.2.163
cargo update -p tracing-subscriber --precise 0.3.17
cargo update -p tracing --precise 0.1.40
cargo update -p tracing-core --precise 0.1.32
cargo update -p tracing-attributes --precise 0.1.27
cargo update -p windows-version --precise 0.1.1
cargo update -p phf:0.11.3 --precise 0.11.2
cargo update -p phf_shared:0.11.3 --precise 0.11.2
cargo update -p phf_macros:0.11.3 --precise 0.11.2
cargo update -p phf_generator:0.11.3 --precise 0.11.2
cargo update -p uuid --precise 1.11.0
# - name: Downgrade crates with MSRV conflict (core)
# if: ${{ matrix.project.name == 'core' }}
# env:
# CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
# # The --precise flag can only be used once per invocation.
# run: |
# cargo update -p system-deps:6.2.2 --precise 6.1.1
# cargo update -p toml:0.7.8 --precise 0.7.3
# cargo update -p toml_edit:0.19.15 --precise 0.19.8
# cargo update -p embed-resource --precise 2.3.0
# cargo update -p notify-rust --precise 4.10.0
# cargo update -p toml_datetime --precise 0.6.1
# cargo update -p serde_spanned --precise 0.6.1
# cargo update -p winnow --precise 0.4.1
# cargo update -p plist --precise 1.5.1
# cargo update -p serde_with:3.12.0 --precise 3.0.0
# cargo update -p time --precise 0.3.15
# cargo update -p ignore --precise 0.4.18
# cargo update -p raw-window-handle --precise 0.5.0
# cargo update -p cargo_toml:0.15.3 --precise 0.15.2
# cargo update -p zbus --precise 3.13.0
# cargo update -p zbus_names --precise 2.5.0
# cargo update -p colored --precise 2.0.2
# cargo update -p arboard --precise 3.2.1
# cargo update -p tempfile --precise 3.6.0
# cargo update -p tokio --precise 1.29.0
# cargo update -p flate2 --precise 1.0.26
# cargo update -p hyper --precise 0.14.28
# cargo update -p h2 --precise 0.3.20
# cargo update -p reqwest --precise 0.11.18
# cargo update -p bstr --precise 1.6.2
# cargo update -p cfg-expr:0.15.8 --precise 0.15.4
# cargo update -p memchr --precise 2.6.2
# cargo update -p async-executor --precise 1.5.1
# cargo update -p proptest --precise 1.2.0
# cargo update -p regex --precise 1.9.6
# cargo update -p bstr --precise 1.6.2
# cargo update -p backtrace --precise 0.3.68
# cargo update -p blocking --precise 1.4.1
# cargo update -p ignore --precise 0.4.18
# cargo update -p globset --precise 0.4.13
# cargo update -p crossbeam-channel --precise 0.5.8
# cargo update -p crossbeam-utils --precise 0.8.16
# cargo update -p image --precise 0.24.4
# cargo update -p async-process --precise 1.7.0
# cargo update -p is-terminal --precise 0.4.7
# cargo update -p tar --precise 0.4.39
# cargo update -p serde_json --precise 1.0.97
# cargo update -p petgraph --precise 0.6.3
# cargo update -p os_str_bytes --precise 6.5.1
# cargo update -p thread_local --precise 1.1.7
# cargo update -p cc --precise 1.0.94
# cargo update -p tree_magic_mini --precise 3.0.3
# cargo update -p tokio-test --precise 0.4.3
# cargo update -p tokio-stream --precise 0.1.14
# cargo update -p tokio-util --precise 0.7.10
# cargo update -p os_pipe --precise 1.1.5
# cargo update -p serde --precise 1.0.210
# cargo update -p pest_derive --precise 2.7.14
# cargo update -p pest_generator --precise 2.7.14
# cargo update -p pest_meta --precise 2.7.14
# cargo update -p pest --precise 2.7.14
# cargo update -p thiserror:1.0.69 --precise 1.0.65
# cargo update -p syn:2.0.96 --precise 2.0.67
# cargo update -p derive_more --precise 0.99.17
# cargo update -p native-tls --precise 0.2.11
# cargo update -p ppv-lite86 --precise 0.2.17
# cargo update -p xml-rs --precise 0.8.20
# cargo update -p mac-notification-sys --precise 0.6.1
# cargo update -p security-framework-sys --precise 2.11.1
# cargo update -p openssl --precise 0.10.66
# cargo update -p openssl-sys --precise 0.9.103
# cargo update -p idna_adapter --precise 1.1.0
# cargo update -p fdeflate --precise 0.3.5
# cargo update -p url --precise 2.5.2
# cargo update -p libc --precise 0.2.163
# cargo update -p tracing-subscriber --precise 0.3.17
# cargo update -p tracing --precise 0.1.40
# cargo update -p tracing-core --precise 0.1.32
# cargo update -p tracing-attributes --precise 0.1.27
# cargo update -p windows-version --precise 0.1.1
# cargo update -p phf:0.11.3 --precise 0.11.2
# cargo update -p phf_shared:0.11.3 --precise 0.11.2
# cargo update -p phf_macros:0.11.3 --precise 0.11.2
# cargo update -p phf_generator:0.11.3 --precise 0.11.2
# cargo update -p uuid --precise 1.11.0

- name: Downgrade crates with MSRV conflict (bundler)
# This is for the bundler but since cli depends on the bundler we enable it for the cli too
if: ${{ matrix.project.name != 'core' }}
# The --precise flag can only be used once per invocation.
run: |
cd tooling/bundler
cargo update -p bitstream-io --precise 2.3.0
cargo update -p yoke --precise 0.7.4
cargo update -p zerofrom --precise 0.1.4
cargo update -p litemap --precise 0.7.3
cargo update -p bstr --precise 1.10.0
cargo update -p windows-version --precise 0.1.1
# - name: Downgrade crates with MSRV conflict (bundler)
# # This is for the bundler but since cli depends on the bundler we enable it for the cli too
# if: ${{ matrix.project.name != 'core' }}
# env:
# CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
# # The --precise flag can only be used once per invocation.
# run: |
# cd tooling/bundler
# cargo update -p bitstream-io --precise 2.3.0
# cargo update -p yoke --precise 0.7.4
# cargo update -p zerofrom --precise 0.1.4
# cargo update -p litemap --precise 0.7.3
# cargo update -p bstr --precise 1.10.0
# cargo update -p windows-version --precise 0.1.1

# Not really required since it's a binary
- name: Downgrade crates with MSRV conflict (cli)
if: ${{ matrix.project.name == 'cli' }}
# The --precise flag can only be used once per invocation.
run: |
cd tooling/cli
cargo update -p clap_complete --precise 4.4.10
cargo update -p clap --precise 4.4.18
cargo update -p bitstream-io --precise 2.3.0
cargo update -p yoke --precise 0.7.4
cargo update -p zerofrom --precise 0.1.4
cargo update -p litemap --precise 0.7.3
cargo update -p bstr --precise 1.10.0
cargo update -p windows-version --precise 0.1.1
# - name: Downgrade crates with MSRV conflict (cli)
# if: ${{ matrix.project.name == 'cli' }}
# env:
# CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
# # The --precise flag can only be used once per invocation.
# run: |
# cd tooling/cli
# cargo update -p clap_complete --precise 4.4.10
# cargo update -p clap --precise 4.4.18
# cargo update -p bitstream-io --precise 2.3.0
# cargo update -p yoke --precise 0.7.4
# cargo update -p zerofrom --precise 0.1.4
# cargo update -p litemap --precise 0.7.3
# cargo update -p bstr --precise 1.10.0
# cargo update -p windows-version --precise 0.1.1

- name: install rust ${{ matrix.project.toolchain || matrix.platform.toolchain }}
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.project.toolchain || matrix.platform.toolchain }}
target: ${{ matrix.platform.target }}

- name: test build
run: cargo check --target ${{ matrix.platform.target }} ${{ matrix.project.flags }}
Expand Down
4 changes: 2 additions & 2 deletions tooling/bundler/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d88675b

Please sign in to comment.