Skip to content

DOCS: remove 'git pull' #1111

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

Merged
merged 2 commits into from
Dec 22, 2020
Merged

DOCS: remove 'git pull' #1111

merged 2 commits into from
Dec 22, 2020

Conversation

mattip
Copy link
Contributor

@mattip mattip commented Dec 22, 2020

continuation of gh-1105

Remove git pull, which was meant to solve a possible race condition (if between the time the CI run clones the repo, builds the project, builds the docs, and check out the gh-pages branch someone else has pushed a change to the branch), but does not work.

Please trigger a nightly build after merging this to test it out.

Copy link
Contributor

@zhangguanheng66 zhangguanheng66 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge it after the CI tests are OK

@codecov
Copy link

codecov bot commented Dec 22, 2020

Codecov Report

Merging #1111 (41c9b0f) into master (aa7176b) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1111   +/-   ##
=======================================
  Coverage   77.54%   77.54%           
=======================================
  Files          45       45           
  Lines        3086     3086           
=======================================
  Hits         2393     2393           
  Misses        693      693           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f472bde...f64d69f. Read the comment docs.

@zhangguanheng66 zhangguanheng66 merged commit 698cdc7 into pytorch:master Dec 22, 2020
@mthrok
Copy link
Contributor

mthrok commented Dec 22, 2020

Triggered nightly build

@mattip
Copy link
Contributor Author

mattip commented Dec 22, 2020

... and it failed. The gh-pages branch does need to be pulled before pushing.

To https://github.com/pytorch/audio.git
 ! [rejected]        gh-pages -> gh-pages (fetch first)
error: failed to push some refs to 'https://github.com/pytorch/audio.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I will try again in another PR, sorry.

@mattip
Copy link
Contributor Author

mattip commented Dec 22, 2020

Note there is no harm in the current state, since the doc push fails it should not break anything.

@mattip mattip mentioned this pull request Dec 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants