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

Switch to Ubuntu 22.04 #33

Merged
merged 3 commits into from Jun 3, 2022
Merged

Switch to Ubuntu 22.04 #33

merged 3 commits into from Jun 3, 2022

Conversation

timja
Copy link
Member

@timja timja commented Jun 2, 2022

No description provided.

@timja timja requested a review from a team as a code owner June 2, 2022 22:30
@basil
Copy link
Contributor

basil commented Jun 7, 2022

This upgraded Git from 2.17.1 to 2.34.1, which broke https://github.com/jenkins-infra/release/blob/927a48721960a027dafbbee8950add22a3a2a84a/utils/release.bash#L414= because Git 2.27 adds a new warning:

+ git pull
From github.com:jenkinsci/jenkins
   a4f9f5b64b..b650de6960  master     -> origin/master
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
script returned exit code 128

To fix this git pull should be updated to e.g. git pull --rebase.

@timja
Copy link
Member Author

timja commented Jun 7, 2022

I did one option here which restored the same value as before:
#39

happy to switch it to rebase if you think it's a better option

@basil
Copy link
Contributor

basil commented Jun 7, 2022

I have a slight subjective preference for rebase because the merge commits interfere with my OCD, but it really does not matter one way or another.

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

Successfully merging this pull request may close these issues.

None yet

3 participants