Skip to content

Conversation

@spapastamkou
Copy link
Contributor

Updates FR 'support us' (nous soutenir) page as per merged #1504

Copy link
Member

@drjwbaker drjwbaker left a comment

Choose a reason for hiding this comment

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

Thank you!

@spapastamkou spapastamkou merged commit 2ec05ca into gh-pages Nov 5, 2019
@spapastamkou spapastamkou deleted the drjwbaker-donations branch November 5, 2019 13:16
@drjwbaker
Copy link
Member

drjwbaker commented Nov 6, 2019

@spapastamkou For some reason this isn't showing on the live site https://programminghistorian.org/fr/nous-soutenir#donations @programminghistorian/technical-team: any ideas?

@walshbr
Copy link
Contributor

walshbr commented Nov 6, 2019

@mdlincoln - I tried restarting the build on Travis and dumping my own cache/hard reloading, but neither got the thing to show up even though it's in the gh-pages repo. Do you have any ideas?

@spapastamkou
Copy link
Contributor Author

To raise this pull request, I restored James' branch that had already been merged in PR #1504, updated it and then made a commit to it with the changes for the FR page. Maybe I should have created a separate branch, perhaps the problem comes from there?

@drjwbaker
Copy link
Member

@walshbr @spapastamkou Do we just need to open a new PR to solve this problem?

@spapastamkou
Copy link
Contributor Author

I am not very sure as to what to do but it is the only thing I can think of. I could try (this evening), @drjwbaker
Also, found this in travis doc: https://docs.travis-ci.com/user/pull-requests/#my-pull-request-isnt-being-built

@walshbr walshbr restored the drjwbaker-donations branch November 12, 2019 14:04
@walshbr
Copy link
Contributor

walshbr commented Nov 12, 2019

That last sentence in that thing you linked to @spapastamkou didn't sound promising - "Restoring the branch of a merged pull request will not trigger a build, nor will pushing a new commit to a branch that has already been merged."

But I think merging a new PR should trigger a new build, and, since the file is already as you want it in the gh-pages repository it should get pulled in. I just merged #1548 since it was ready to see if that fixes the issue here. I'll report back.

@walshbr
Copy link
Contributor

walshbr commented Nov 12, 2019

@drjwbaker @spapastamkou - I think that did it. Looks like https://programminghistorian.org/fr/nous-soutenir#donations is showing up on the main site now but ping me if it does not?

@walshbr walshbr deleted the drjwbaker-donations branch November 12, 2019 14:12
@drjwbaker
Copy link
Member

Bingo

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.

6 participants