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

Fix deploy script for tag deploys #5235

Merged
merged 1 commit into from
Mar 5, 2020
Merged

Conversation

flip1995
Copy link
Member

By hand updating the documentation for the rust-1.41.1 release, I found, that the deploy script was buggy for tag deploys. Luckily we weren't affected yet (will only run if the commit of the tag already has the workflow config, so probably ~rust-1.43.0)

The bug:

When a tag was deployed, until now it also updated the master documentation to the state of the tag. This was because the git add . not only updated the files created or modified by the tag commit, but also the master lints.json file.

changelog: none

@flip1995 flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Feb 27, 2020
@phansch phansch self-requested a review March 5, 2020 06:10
@phansch
Copy link
Member

phansch commented Mar 5, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Mar 5, 2020

📌 Commit f822497 has been approved by phansch

@bors
Copy link
Contributor

bors commented Mar 5, 2020

⌛ Testing commit f822497 with merge 2a57879...

bors added a commit that referenced this pull request Mar 5, 2020
Fix deploy script for tag deploys

By hand updating the documentation for the `rust-1.41.1` release, I found, that the deploy script was buggy for tag deploys. Luckily we weren't affected yet (will only run if the commit of the tag already has the workflow config, so probably ~`rust-1.43.0`)

The bug:

When a tag was deployed, until now it also updated the master documentation to the state of the tag. This was because the `git add .` not only updated the files created or modified by the tag commit, but also the master lints.json file.

changelog: none
@bors
Copy link
Contributor

bors commented Mar 5, 2020

💔 Test failed - checks-action_test

@phansch
Copy link
Member

phansch commented Mar 5, 2020

   ...
   Compiling rand_chacha v0.2.1
   Compiling term v0.6.1
error[E0433]: failed to resolve: could not find `__rt` in `quote`

looks like another rustup might be needed?

@flip1995
Copy link
Member Author

flip1995 commented Mar 5, 2020

Not a Clippy issue: rust-lang-deprecated/failure#342

@phansch
Copy link
Member

phansch commented Mar 5, 2020

@bors retry (new versions were released)

@bors
Copy link
Contributor

bors commented Mar 5, 2020

⌛ Testing commit f822497 with merge ac2e10a...

@bors
Copy link
Contributor

bors commented Mar 5, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: phansch
Pushing ac2e10a to master...

@bors bors merged commit ac2e10a into rust-lang:master Mar 5, 2020
@flip1995 flip1995 deleted the tag_deploy_fix branch May 4, 2020 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants