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

The latest/ directory in git repository #170

Merged
merged 3 commits into from
Jul 31, 2017

Conversation

praiskup
Copy link
Contributor

@praiskup
Copy link
Contributor Author

praiskup commented May 3, 2017

Preparing this PR eats some energy, so if we agree that something like this is worth it (and there's some reviewer and committer), I'll rebase and re-propose.

@pkubatrh
Copy link
Member

pkubatrh commented May 3, 2017

As stated in sclorg/container-common-scripts#4 this gets a +1 from me.
The only issue I have is that with 9.5/ being a symlink to latest we effectively lose all existing links (and the ability to link) to the 9.5/ code on github.

@praiskup
Copy link
Contributor Author

praiskup commented May 3, 2017

The only issue I have is that with 9.5/ being a symlink to latest we effectively lose all existing links (and the ability to link) to the 9.5/ code on github.

The question is whether it is correct to reference file in "9.5" directory.. something like this was also mentioned in 0860eb4

Having "single source of truth" could resolve this once and forever..

@omron93
Copy link
Contributor

omron93 commented May 3, 2017

+1 from me too.

One question, where to write "rule" like this? (other sclorg/ images should follow this PR and have latest/ version too)

@pkubatrh
Copy link
Member

pkubatrh commented May 4, 2017

The question is whether it is correct to reference file in "9.5" directory.. something like this was also mentioned in 0860eb4

I agree with the question but from the comment on the commit you linked it seems some people actually link to the repository this way.
I mean this is by no means a blocker for me, it's just something I wanted to throw into the discussion. If we want we could also mitigate this by waiting until the next version of the image (9.6) and make a symlink out of that one.

@praiskup
Copy link
Contributor Author

praiskup commented May 17, 2017

@torsava, @hhorak FYI.

Btw., if (at the time of branching) we moved 9.5 to 9.6, and created the new 9.5 directory (what @torsava proposed I believe) we would loose the history because git thinks that 9.5 stayed "unchanged" and 9.6 is new. So we would have to have two commits for each "branching" time ... (1. commit does the movement, and the 2. commit C&P). So in the end, the "latest" + symlink alternative sounds like we can more easily "enforce" such guideline.

@praiskup
Copy link
Contributor Author

I mean this is by no means a blocker for me, it's just something I wanted to throw into the discussion. If we want we could also mitigate this by waiting until the next version of the image (9.6) and make a symlink out of that one.

I neither feel we are blocked here, and waiting is IMO not that important (if there were such links to 9.5, those would be soon fixed once we move latest to 9.6 version).

@torsava
Copy link
Member

torsava commented May 17, 2017

Btw., if (at the time of branching) we moved 9.5 to 9.6, and created the new 9.5 directory (what @torsava proposed I believe) we would loose the history because git thinks that 9.5 stayed "unchanged" and 9.6 is new. So we would have to have two commits for each "branching" time ... (1. commit does the movement, and the 2. commit C&P). So in the end, the "latest" + symlink alternative sounds like we can more easily "enforce" such guideline.

Indeed you would need 2 commits. I like the moving alternative because I feel it makes the repo cleaner, but I agree it would be impossible to enforce and thus using the latest approach will likely be more sustainable.

@hhorak
Copy link
Member

hhorak commented Jul 14, 2017

I like this approach as well (sorry for delay).

@praiskup praiskup changed the title The latest version The latest/ directory in git repository Jul 27, 2017
@praiskup praiskup force-pushed the the-latest-version branch from fd9b7ed to 4141a9b Compare July 27, 2017 10:49
@praiskup
Copy link
Contributor Author

I rebased the PR; the first commit is prerequisite from PR #180.

@pkubatrh
Copy link
Member

help.1 file present in latest, probably a leftover from the deprecated 9.2

@praiskup praiskup force-pushed the the-latest-version branch from 4141a9b to 2384f66 Compare July 27, 2017 11:05
@praiskup
Copy link
Contributor Author

Good catch, thanks! Should be fixed.

@praiskup praiskup force-pushed the the-latest-version branch from 2384f66 to ef7b3e6 Compare July 27, 2017 12:40
praiskup added 3 commits July 27, 2017 14:41
Move '9.2' into 'latest' to keep the whole commit history.
Copy 'latest' into '9.2'.  We sacrifice git history of 9.2 to have
better history in latest.
Copy related changes from 9.5 into latest, and replace the whole 9.5 with
symlink to latest.
@praiskup praiskup force-pushed the the-latest-version branch from ef7b3e6 to 15dc0ca Compare July 27, 2017 12:41
@pkubatrh
Copy link
Member

lgtm. Lets merge and try out this approach.

@pkubatrh pkubatrh merged commit 6ebd08b into sclorg:master Jul 31, 2017
@praiskup praiskup deleted the the-latest-version branch March 28, 2018 14:55
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.

5 participants