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

Stabilize Alternative Registries #6654

Merged
merged 6 commits into from Feb 12, 2019

Conversation

Projects
None yet
6 participants
@ehuss
Copy link
Contributor

ehuss commented Feb 11, 2019

This includes a few minor changes besides stabilizing:

  • cargo search won't display crates.io search URL for extra results for non-crates.io registries.
  • Document using environment variables for API tokens.
  • Explicit section in config.md for documenting the credentials file.

Closes rust-lang/rust#44931
Closes rust-lang/crates-io-cargo-teams#21
Closes #6589
Closes #4688

@ehuss ehuss referenced this pull request Feb 11, 2019

Closed

Document registries. #6594

@ehuss ehuss added the relnotes label Feb 11, 2019

@alexcrichton
Copy link
Member

alexcrichton left a comment

This all looks fantastic to me, just a few minor nits. Thanks again so much for all your work here @ehuss!

let registry_id = SourceId::alt_registry(cx.config, registry)?;
dep.set_registry_id(registry_id);
}
if let Some(registry_index) = &self.registry_index {
cx.features.require(Feature::alternative_registries())?;

This comment has been minimized.

@alexcrichton

alexcrichton Feb 12, 2019

Member

technically speaking we don't have to delete this code, but also technically speaking there's no reason to keep the code around!

The token for crates.io may be specified with the `CARGO_REGISTRY_TOKEN`
environment variable. Tokens for other registries may be specified with
environment variables of the form `CARGO_REGISTRIES_NAME_TOKEN` where `NAME`
is the name of the registry in all capital letters.

This comment has been minimized.

@alexcrichton

alexcrichton Feb 12, 2019

Member

I wonder if this could perhaps mention that the env vars are derived from the .cargo/config configuration to ensure both mechanisms are mentioned here?

token = "854DvwSlUwEHtIo3kWy6x7UCPKHfzCmy"
```

### Running a Registry

This comment has been minimized.

@alexcrichton

alexcrichton Feb 12, 2019

Member

Could some text be added to this section along the lines of:

  • There's no widely used piece of software used to run your own registry
  • We are, however, very interested in documenting those which crop up
  • We're also interested in documenting integration with existing package caches once they have crates.io support
@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Feb 12, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 12, 2019

📌 Commit 902885c has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 12, 2019

⌛️ Testing commit 902885c with merge 2e4cfc2...

bors added a commit that referenced this pull request Feb 12, 2019

Auto merge of #6654 - ehuss:alt-stabilize, r=alexcrichton
Stabilize Alternative Registries

This includes a few minor changes besides stabilizing:
- `cargo search` won't display `crates.io` search URL for extra results for non-crates.io registries.
- Document using environment variables for API tokens.
- Explicit section in `config.md` for documenting the credentials file.

Closes rust-lang/rust#44931
Closes rust-lang/crates-io-cargo-teams#21
Closes #6589
Closes #4688
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 2e4cfc2 to master...

@bors bors merged commit 902885c into rust-lang:master Feb 12, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details

@bors bors referenced this pull request Feb 12, 2019

Merged

HTTPS all the things #6614

@ninrod

This comment has been minimized.

Copy link

ninrod commented Feb 12, 2019

this seems great. So can I use rust with artifactory now?

@ehuss ehuss referenced this pull request Feb 20, 2019

Merged

Update cargo #58584

@nbigaouette-eai

This comment has been minimized.

Copy link

nbigaouette-eai commented Feb 20, 2019

For artifactory support, please vote for the feature request here: https://www.jfrog.com/jira/browse/RTFACT-13469

bors added a commit to rust-lang/rust that referenced this pull request Feb 21, 2019

Auto merge of #58584 - ehuss:update-cargo, r=alexcrichton
Update cargo

9 commits in 865cb70106a6b1171a500ff68f93ab52eea56e72..b33ce7fc9092962b0657b4c25354984b5e5c47e4
2019-02-10 15:49:37 +0000 to 2019-02-19 18:42:50 +0000
- Don't retry invalid credentials from git credential helpers (rust-lang/cargo#6681)
- Fix some typos in resolver tests (rust-lang/cargo#6682)
- Add an unstable option to build proc macros for both the host and the target (rust-lang/cargo#6547)
- Test cases proving RUSTC_WRAPPER can be a relative path (rust-lang/cargo#6638)
- Add support for Azure DevOps (rust-lang/cargo#6264)
- Update docs for removed `patch` restriction. (rust-lang/cargo#6663)
- Fix incorrect help message (rust-lang/cargo#6555)
- Stabilize Alternative Registries (rust-lang/cargo#6654)
- Having a [patch] section when publishing is not an error (rust-lang/cargo#6535)
@przygienda

This comment has been minimized.

Copy link

przygienda commented Feb 21, 2019

yeah ! ;-)

bors added a commit to rust-lang/rust that referenced this pull request Feb 21, 2019

Auto merge of #58584 - ehuss:update-cargo, r=alexcrichton
Update cargo

9 commits in 865cb70106a6b1171a500ff68f93ab52eea56e72..b33ce7fc9092962b0657b4c25354984b5e5c47e4
2019-02-10 15:49:37 +0000 to 2019-02-19 18:42:50 +0000
- Don't retry invalid credentials from git credential helpers (rust-lang/cargo#6681)
- Fix some typos in resolver tests (rust-lang/cargo#6682)
- Add an unstable option to build proc macros for both the host and the target (rust-lang/cargo#6547)
- Test cases proving RUSTC_WRAPPER can be a relative path (rust-lang/cargo#6638)
- Add support for Azure DevOps (rust-lang/cargo#6264)
- Update docs for removed `patch` restriction. (rust-lang/cargo#6663)
- Fix incorrect help message (rust-lang/cargo#6555)
- Stabilize Alternative Registries (rust-lang/cargo#6654)
- Having a [patch] section when publishing is not an error (rust-lang/cargo#6535)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.