Skip to content

Fix deployment #1957

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
Feb 26, 2025
Merged

Fix deployment #1957

merged 2 commits into from
Feb 26, 2025

Conversation

dscho
Copy link
Member

@dscho dscho commented Feb 26, 2025

Changes

Context

#1953 tried to ensure that no links to http://git-scm.com/ were part of the deployment (note the missing "s" in "http").

Unfortunately, there are plenty of such links to go around, most of them in translations of the ProGit book (out of our control) and the remaining ones in the gitweb.conf manual pages related to Git versions prior to v2.13.0 (specifically, before commit git/git@e52a53d).

This caused the deploy workflow run to fail.

I've added a work-around in this here PR by manually forcing http://-only links specifically to git-scm.com in the book/ and docs/ pages to https:// ones.

To make sure that this kind of problem is caught in PRs before merging, I've also extended the check to catch http://git-scm.com links also when deploying to a fork. To verify that this works as intended, I deployed to my fork with these changes, which was successful, and then I deployed with the fix reverted (for testing), which failed as expected.

/cc @b9a1

After merging git#1953, as per
https://github.com/git/git-scm.com/actions/runs/13539600621/job/37837557415#step:3:135167
the `deploy` workflow failed.

This issue should have been found in a PR build, but was not. Let's make
sure that similar issues will be found early in the future, before
merging the respective PR.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The new checks for HTTPS enforcement found a couple of problems:
git#1953 (comment)

Essentially, some (quite stale) translations of the ProGit book, as well
as manual pages of older Git versions, use http://git-scm.com links. And
those are basically outside of our control to fix properly (in
particular the manual pages of older Git versions).

So let's just work around this by manually replacing them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Feb 26, 2025
@b9a1
Copy link
Contributor

b9a1 commented Feb 26, 2025

Looks good to me. I was about to open a new PR to drop this test if it causes more trouble than it solves, but thank you for still making it work!

@dscho dscho merged commit 88ad648 into git:gh-pages Feb 26, 2025
1 check passed
@dscho dscho deleted the fix-deployment branch February 26, 2025 13:03
@dscho
Copy link
Member Author

dscho commented Feb 26, 2025

It worked!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants