-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add Ubuntu 24.04 to build matrix (#13626)
* feat: add ubuntu 24.04 to build matrix * fix(bazel): libxcrypt 2404 version comment Co-authored-by: Wangchong Zhou <[email protected]> * fix(gha): rm unneeded python on runner --------- Co-authored-by: Wangchong Zhou <[email protected]>
- Loading branch information
1 parent
b3e065e
commit f9e6f39
Showing
13 changed files
with
556 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
build/cross_deps/libxcrypt/001-4.4.27-enable-hash-all.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| This is roughly adapted from https://patchwork.yoctoproject.org/project/oe-core/patch/[email protected] | ||
| Which is a patch adopted around 4.4.30 upstream. | ||
|
|
||
| diff --color -Naur a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm | ||
| --- a/build-aux/scripts/BuildCommon.pm 2021-12-17 07:16:06.000000000 -0800 | ||
| +++ b/build-aux/scripts/BuildCommon.pm 2024-09-05 12:47:53.534533364 -0700 | ||
| @@ -519,19 +519,19 @@ | ||
| my $COMPAT_ABI; | ||
| local $_; | ||
| for (@args) { | ||
| - when (/^SYMVER_MIN=(.+)$/) { | ||
| + if (/^SYMVER_MIN=(.+)$/) { | ||
| $usage_error->() if defined $SYMVER_MIN; | ||
| $SYMVER_MIN = $1; | ||
| } | ||
| - when (/^SYMVER_FLOOR=(.+)$/) { | ||
| + elsif (/^SYMVER_FLOOR=(.+)$/) { | ||
| $usage_error->() if defined $SYMVER_FLOOR; | ||
| $SYMVER_FLOOR = $1; | ||
| } | ||
| - when (/^COMPAT_ABI=(.+)$/) { | ||
| + elsif (/^COMPAT_ABI=(.+)$/) { | ||
| $usage_error->() if defined $COMPAT_ABI; | ||
| $COMPAT_ABI = $1; | ||
| } | ||
| - default { | ||
| + else { | ||
| $usage_error->() if defined $map_in; | ||
| $map_in = $_; | ||
| } | ||
| diff --color -Naur a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h | ||
| --- a/build-aux/scripts/gen-crypt-h 2021-12-17 07:16:06.000000000 -0800 | ||
| +++ b/build-aux/scripts/gen-crypt-h 2024-09-05 12:48:58.446980478 -0700 | ||
| @@ -37,22 +37,20 @@ | ||
| local $_; | ||
| while (<$fh>) { | ||
| chomp; | ||
| - # Yes, 'given $_' is really required here. | ||
| - given ($_) { | ||
| - when ('#define HAVE_SYS_CDEFS_H 1') { | ||
| - $have_sys_cdefs_h = 1; | ||
| - } | ||
| - when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { | ||
| - $have_sys_cdefs_begin_end_decls = 1; | ||
| - } | ||
| - when ('#define HAVE_SYS_CDEFS_THROW 1') { | ||
| - $have_sys_cdefs_throw = 1; | ||
| - } | ||
| - when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { | ||
| - $substs{XCRYPT_VERSION_STR} = $1; | ||
| - $substs{XCRYPT_VERSION_MAJOR} = $2; | ||
| - $substs{XCRYPT_VERSION_MINOR} = $3; | ||
| - } | ||
| + | ||
| + if ($_ eq '#define HAVE_SYS_CDEFS_H 1') { | ||
| + $have_sys_cdefs_h = 1; | ||
| + } | ||
| + elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { | ||
| + $have_sys_cdefs_begin_end_decls = 1; | ||
| + } | ||
| + elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') { | ||
| + $have_sys_cdefs_throw = 1; | ||
| + } | ||
| + elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { | ||
| + $substs{XCRYPT_VERSION_STR} = $1; | ||
| + $substs{XCRYPT_VERSION_MAJOR} = $2; | ||
| + $substs{XCRYPT_VERSION_MINOR} = $3; | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| message: "Add Ubuntu 24.04 (Noble Numbat) to build" | ||
| type: dependency |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
f9e6f39There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bazel Build
Docker image available
kong/kong:f9e6f39dbcbac5cc199392b06d0dd73a80f39e66Artifacts available https://github.com/Kong/kong/actions/runs/10778201299