Skip to content

Commit

Permalink
Hard reset instead of pull.
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredrikekre
fredrikekre committed Apr 27, 2020
1 parent 9a960ec commit 3c6a58c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pdf/make.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ function commit()
@info "committing built PDF files."

# Make sure the repo is up to date
run(`git pull origin`)
run(`git fetch origin`)
run(`git reset --hard origin/assets`)

mktemp() do keyfile, iokey; mktemp() do sshconfig, iossh
# Set up keyfile
Expand Down

1 comment on commit 3c6a58c

@mortenpi
Copy link
Collaborator

Choose a reason for hiding this comment

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

@fredrikekre I think this is causing the PDF docs not to update (JuliaLang/julia#36363). The build_* functions copy to $JULIA_DOCS, but then this git reset --hard will restore them to the last commit. I think the reason why 1.6.0-DEV.0 was able to deploy after this commit is because git reset --hard doesn't touch untracked files.

I guess this change was necessary to avoid some race conditions / merge conflicts? Do you see any better solution other than just building the PDFs into a separate directory and copying them over to $JULIA_DOCS here in commit() after the git reset?

Please sign in to comment.