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.

Sign up for GitHub

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

Jump to bottom

Packages can inherit fields from their root workspace #9684

Closed
wants to merge 14 commits into from
Closed

Packages can inherit fields from their root workspace #9684

wants to merge 14 commits into from

Commits on Jul 13, 2021

  1. Add additional fields to Cargo.toml for workspaces

    @Muscraft
    Muscraft committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    9d559b6 View commit details
    Browse the repository at this point in the history

  2. Add tests for additional fields in Cargo.toml for workspaces

    @Muscraft
    Muscraft committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    62ba1f1 View commit details
    Browse the repository at this point in the history

  3. Delayed parsing of manifests into packages until after a root config … 

    …has been found and added IntermediateManifest
    @Muscraft
    Muscraft committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    0e7696c View commit details
    Browse the repository at this point in the history

  4. - Added inheriting TomlProject fields 

    - Added inheriting dependencies from Workspaces
- Added tests for inheriting TomlProject fields and dependencies
- Fixed tests as needed

Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    36bce7f View commit details
    Browse the repository at this point in the history

  5. - Fixed one call to SourceConfigMap.load() after merging 

    Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    3327880 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Merge branch 'rust-lang:master' into dedup_workspace

    @Muscraft
    Muscraft authored Jul 14, 2021
    Configuration menu
    Copy the full SHA
    da03efb View commit details
    Browse the repository at this point in the history

  2. Fixed CI problem with rust fmt 

    Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    43487e9 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. Added tests to ensure published manifests do not contain workspace = … 

    …true

Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    12302ad View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dedup_workspace 

    # Conflicts:
#	src/cargo/core/source/source_id.rs
#	src/cargo/ops/cargo_package.rs
    @Muscraft
    Muscraft committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    c6d75f5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into dedup_workspace 

    # Conflicts:
#	src/cargo/ops/cargo_install.rs
    @Muscraft
    Muscraft committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    e02f69d View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. - Added cache for InheritableFields 

    - Changed parsing of manifests, so they only get parsed once
- Removed InheritableFields from places it does not belong
- Updated tests

Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    f60aabf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dedup_workspace 

    # Conflicts:
#	tests/testsuite/build_script.rs
    @Muscraft
    Muscraft committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    452d02b View commit details
    Browse the repository at this point in the history

  3. - Fixed test for inherit_workspace_fields 

    Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    a7d41d6 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. - Fixed test for inherit_workspace_fields 

    Signed-off-by: Scott Schafer <23045215+Muscraft@users.noreply.github.com>
    @Muscraft
    Muscraft committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    155932d View commit details
    Browse the repository at this point in the history