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 link of Big Techday talk & Java aktuell #1810

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

hankem
Copy link
Member

@hankem hankem commented Dec 16, 2024

This PR fixes some links on https://jgiven.org/ (i.e. branch gh-pages).

The old link to the video of the Big Techday talk is not available anymore.

docs.md Outdated
Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/TNG/JGiven/blob/master/README.md links to https://jgiven.org/docs/, but I did not see how this was reachable from https://jgiven.org/.

Do we want to maintain this page? Couldn't the README simply link to https://jgiven.org/?

@hankem hankem changed the title fix link of Big Techday talk fix link of Big Techday talk & Java aktuell Dec 16, 2024
@hankem hankem force-pushed the fix-link-BTD-talk-gh-pages branch from 57cd903 to bc14595 Compare December 17, 2024 08:05
@hankem
Copy link
Member Author

hankem commented Dec 17, 2024

It seems that the github-actions got confused with the target branch of this PR being gh-pages, and did some rebase?
This PR should currently just have three (small) commits.

@TNG TNG deleted a comment from m-2squared Dec 17, 2024
@TNG TNG deleted a comment from m-2squared Dec 17, 2024
@TNG TNG deleted a comment from m-2squared Dec 17, 2024
@TNG TNG deleted a comment from m-2squared Dec 17, 2024
README.md Outdated
@@ -1,76 +1 @@
[![Build Status](https://img.shields.io/github/actions/workflow/status/tng/jgiven/jgiven_branch_and_pr_build.yml?branch=master)](https://github.com/TNG/JGiven/actions/workflows/jgiven_branch_and_pr_build.yml)
Copy link
Collaborator

Choose a reason for hiding this comment

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

are those fancy badges out?
I kinda like them

Copy link
Member Author

Choose a reason for hiding this comment

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

I had essentially removed the entire README on the gh-pages branch as long as it was out of sync with the master branch, to avoid redunant (and outdate) information. If you prefer to keep those branches synchronized, that commit should be dropped, of course.

Copy link
Collaborator

Choose a reason for hiding this comment

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

The entire point of rebasing gh-pages is that I want to have changes on the main branch be in gh-pages as well.
Consequently, the readme should not be touched in the gh-pages branch...
(but apparently it has. Thatwould be somethign for me to fix)

Copy link
Member Author

@hankem hankem Dec 17, 2024

Choose a reason for hiding this comment

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

I've dropped the commit touching README.md (and rebased to the current version of the gh-actions branch 😉).

README.md Outdated Show resolved Hide resolved
@hankem hankem force-pushed the fix-link-BTD-talk-gh-pages branch from bc14595 to 0257fd6 Compare December 17, 2024 20:34
@l-1squared l-1squared merged commit bf07925 into TNG:gh-pages Dec 18, 2024
10 checks passed
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