Skip to content

ci: Replace soon EOL hirsute with jammy #23504

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 16, 2021
Merged

ci: Replace soon EOL hirsute with jammy #23504

merged 1 commit into from
Nov 16, 2021

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 13, 2021

hirsute will be EOL in about 1.5 months, at which point the package servers may be shut down. Avoid this by hopping to the next LTS release 22.04 (Jammy Jellyfish).

While the release is currently in development, it seems unlikely that anything will break for us. I am doing the hirsute->jammy hop to avoid a hirsute->impish->jammy hop, but if anything does break, we can fall back to that "double hop".

@hebasto
Copy link
Member

hebasto commented Nov 13, 2021

Concept ACK on moving from hirsute.

While the release is currently in development, it seems unlikely that anything will break for us. I am doing the hirsute->jammy hop to avoid a hirsute->impish->jammy hop, but if anything does break, we can fall back to that "double hop".

One more hop does not look too difficult to be done. Maybe avoid any concerns about using a non-final release in our CI, and just do a "double hop"?

@dougEfresh dougEfresh mentioned this pull request Nov 13, 2021
Closed
@DrahtBot DrahtBot added the Tests label Nov 13, 2021
@maflcko
Copy link
Member Author

maflcko commented Nov 13, 2021

We'll also might have to backport to 22.x, so a single commit seems preferable. If this is too risky to merge right now, I am happy to wait until it is considered less risky.

@hebasto
Copy link
Member

hebasto commented Nov 13, 2021

We'll also might have to backport to 22.x, so a single commit seems preferable.

Agree.

If this is too risky to merge right now, I am happy to wait until it is considered less risky.

I'm not familiar with Ubuntu development process closely. I'm fine with using a public beta release (yes, I understand that it will happen after hirsute EOL).

@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 14, 2021 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #23520 (ci: Rework ci task names (take 3) by MarcoFalke)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@laanwj
Copy link
Member

laanwj commented Nov 15, 2021

If this is too risky to merge right now, I am happy to wait until it is considered less risky.

What is the risk here? That there are intermediate failures due to the distribution itself being in development?

fanquake
fanquake approved these changes Nov 16, 2021
View reviewed changes
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK fafa66e

Zero-1729
Zero-1729 reviewed Nov 16, 2021
View reviewed changes
Copy link
Contributor

@Zero-1729 Zero-1729 left a comment

Choose a reason for hiding this comment

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

crACK fafa66e

Worst case, if anything breaks due to 22.04 still being in development, we can hop back to 21.10 before the final jammy release is available in April next year.

@DrahtBot DrahtBot mentioned this pull request Nov 16, 2021
Merged
@maflcko
Copy link
Member Author

maflcko commented Nov 16, 2021

Jup, if something goes wrong, we'll have an hirsute->jammy->impish->jammy hop

@fanquake fanquake merged commit ad09c28 into bitcoin:master Nov 16, 2021
@maflcko maflcko deleted the 2111-ciJammy branch November 16, 2021 08:53
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 16, 2021
@fanquake
Merge bitcoin#23504: ci: Replace soon EOL hirsute with jammy
0885e61
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Nov 25, 2021
@fanquake
ci: Replace soon EOL hirsute with jammy
406e313 
Github-Pull: bitcoin#23504
Rebased-From: fafa66e
@fanquake
Copy link
Member

Added to #23276 for backport to the 22.x branch.

@fanquake fanquake mentioned this pull request Nov 25, 2021
Merged
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Feb 14, 2022
@fanquake
ci: Replace soon EOL hirsute with jammy
b535454 
Github-Pull: bitcoin#23504
Rebased-From: fafa66e
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Feb 15, 2022
@fanquake
ci: Replace soon EOL hirsute with jammy
2f60fc6 
Github-Pull: bitcoin#23504
Rebased-From: fafa66e
fanquake added a commit that referenced this pull request Mar 1, 2022
@fanquake
Merge #23276: [22.x] Backports for 22.x
9b5f674 
269553f test: Call ceildiv helper with integer (Martin Zumsande)
2f60fc6 ci: Replace soon EOL hirsute with jammy (MarcoFalke)
801b0f0 build: patch qt to explicitly define previously implicit header include (Kittywhiskers Van Gogh)
c768bfa tests: Calculate fees more similarly to CFeeRate::GetFee (Andrew Chow)
f66bc42 tests: Test for assertion when feerate is rounded down (Andrew Chow)
bd7e08e fees: Always round up fee calculated from a feerate (Andrew Chow)
227ae65 wallet: fix segfault by avoiding invalid default-ctored `external_spk_managers` entry (Sebastian Falbesoner)
282863a refactor: include a missing <limits> header in fs.cpp (Joan Karadimov)
7febe4f consensus: don't call GetBlockPos in ReadBlockFromDisk without lock (Jon Atack)
c671c6f the result of CWallet::IsHDEnabled() was initialized with true. (Saibato)
a5a1538 build, qt: Fix typo in QtInputSupport check (Hennadii Stepanov)
c95b188 system: skip trying to set the locale on NetBSD (fanquake)
c1cdedd guix: Fix powerpc64(le) dynamic linker name (Carl Dong)
92d44ff doc: Add 23061 release notes (MarcoFalke)
db76db7 Fix (inverse) meaning of -persistmempool (MarcoFalke)
85c78e0 build: Restrict check for CRC32C intrinsic to aarch64 (W. J. van der Laan)

Pull request description:

  Collecting backports for the 22.1 release. Currently:
  * #23045
  * #23061
  * #23148
  * #22390
  * #22820
  * #22781
  * #22895
  * #23335
  * #23333
  * #22949
  * #23580
  * #23504
  * #24239

ACKs for top commit:
  achow101:
    ACK 269553f

Tree-SHA512: b3a57ea241be7a83488eeb032276f4cf82a0987aada906a82f94a20c4acf9f2397708249dcecbe1c7575e70d09c60b835233d4718af4013c7bc58896c618274c
@reddink reddink mentioned this pull request May 26, 2022
Merged
@psgreco psgreco mentioned this pull request Sep 7, 2022
Merged
@bitcoin bitcoin locked and limited conversation to collaborators Nov 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@fanquake fanquake fanquake approved these changes

+1 more reviewer

@Zero-1729 Zero-1729 Zero-1729 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@maflcko @hebasto @DrahtBot @laanwj @fanquake @Zero-1729