Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace CI RUST_MIN_VER_PKGS with --workspace --ignore-private. #782

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ env:
# Be sure to also update the rust-version property in the workspace Cargo.toml file,
# plus all the README.md files of the affected packages.
RUST_MIN_VER: "1.81"
# List of packages that will be checked with the minimum supported Rust version.
# This should be limited to packages that are intended for publishing.
RUST_MIN_VER_PKGS: "-p xilem -p xilem_core -p masonry"
# List of packages that can not target Wasm.
NO_WASM_PKGS: "--exclude masonry --exclude xilem"
# Only some of our examples support Android (primarily due to extra required boilerplate).
Expand Down Expand Up @@ -44,6 +41,7 @@ env:
#
# The MSRV jobs run only cargo check because different clippy versions can disagree on goals and
# running tests introduces dev dependencies which may require a higher MSRV than the bare package.
# Checking is limited to packages that are intended for publishing to keep MSRV as low as possible.
#
# If the workspace uses debug_assertions then we verify code twice, with it set to true or false.
# We always keep it true for external dependencies so that we can reuse the cache for faster builds.
Expand Down Expand Up @@ -375,11 +373,11 @@ jobs:
save-if: ${{ github.event_name != 'merge_group' }}

- name: Run cargo check
run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} --locked --profile ci --optional-deps --each-feature
run: cargo hack check --workspace --ignore-private --locked --profile ci --optional-deps --each-feature

- name: Run cargo check (no debug_assertions)
if: env.USING_DEBUG_ASSERTIONS == 'true'
run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} --locked --profile ci --optional-deps --each-feature
run: cargo hack check --workspace --ignore-private --locked --profile ci --optional-deps --each-feature
env:
CARGO_PROFILE_CI_DEBUG_ASSERTIONS: "false"

Expand Down Expand Up @@ -407,11 +405,11 @@ jobs:
save-if: ${{ github.event_name != 'merge_group' }}

- name: Run cargo check
run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature
run: cargo hack check --workspace --ignore-private ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature

- name: Run cargo check (no debug_assertions)
if: env.USING_DEBUG_ASSERTIONS == 'true'
run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature
run: cargo hack check --workspace --ignore-private ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature
env:
CARGO_PROFILE_CI_DEBUG_ASSERTIONS: "false"

Expand Down
16 changes: 7 additions & 9 deletions tree_arena/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
[package]
name = "tree_arena"
version = "0.1.0"
description = "An arena allocated tree designed for Linebender"
description = "An arena allocated tree."
keywords = ["arena", "tree"]
categories = ["gui"]
categories = ["algorithms", "data-structures"]
edition.workspace = true
rust-version.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
rust-version.workspace = true

publish = false # Remove just before publishing

[package.metadata.docs.rs]
all-features = true # all features are enabled - this means that the generated docs are for the safe version
# There are no platform specific docs.
default-target = "x86_64-unknown-linux-gnu"
targets = []
# rustdoc-scrape-examples tracking issue https://github.com/rust-lang/rust/issues/88791
# cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"] # no examples yet
DJMcNab marked this conversation as resolved.
Show resolved Hide resolved


[dependencies]
hashbrown.workspace = true

[features]
# This crate contains two implementations of a tree for use in masonry, one safe and the other unsafe.
Expand All @@ -33,3 +28,6 @@ safe_tree = []

[lints]
workspace = true

[dependencies]
hashbrown.workspace = true
Loading