Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
Water-Melon committed Jun 22, 2024
1 parent c0d738c commit b36cc8c
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 161 deletions.
161 changes: 0 additions & 161 deletions .github/matrix-commitly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,13 @@ build-packages:
# bazel-args: additional bazel build flags
# check-manifest-suite: the check manifest suite as defined in scripts/explain_manifest/config.py

# Ubuntu
- label: ubuntu-20.04
image: ubuntu:20.04
package: deb
check-manifest-suite: ubuntu-20.04-amd64
- label: ubuntu-22.04
package: deb
check-manifest-suite: ubuntu-22.04-amd64

# Debian
- label: debian-10
image: debian:10
package: deb
check-manifest-suite: debian-10-amd64
- label: debian-11
image: debian:11
package: deb
check-manifest-suite: debian-11-amd64

# Alpine
- label: alpine
os: vars.RELEASE_RUNS_ON
package: apk
bazel-args: --platforms=//:alpine-crossbuild-x86_64
check-manifest-suite: alpine-amd64

# CentOS
- label: centos-7
os: vars.RELEASE_RUNS_ON
image: centos:7
package: rpm
package-type: el7
check-manifest-suite: el7-amd64

# RHEL
- label: rhel-7
image: centos:7
package: rpm
package-type: el7
check-manifest-suite: el7-amd64
- label: rhel-8
image: rockylinux:8
package: rpm
package-type: el8
check-manifest-suite: el8-amd64

# Amazon Linux
- label: amazonlinux-2
image: amazonlinux:2
package: rpm
package-type: aws2
check-manifest-suite: amazonlinux-2-amd64
- label: amazonlinux-2023
image: amazonlinux:2023
package: rpm
package-type: aws2023
check-manifest-suite: amazonlinux-2023-amd64

build-images:
# Only build images for the latest version of each major release.

Expand All @@ -74,122 +23,19 @@ build-images:
# artifact-from-alt: another label of build-packages to use for downloading package (to build multi-arch image)
# docker-platforms: comma separated list of docker buildx platforms to build for

# Ubuntu
- label: ubuntu
base-image: ubuntu:22.04
package: deb
artifact-from: ubuntu-22.04
docker-platforms: linux/amd64

# Centos
- label: centos7
base-image: centos:7
package: rpm
package-distro: el7
artifact-from: centos-7

- label: rhel7
base-image: centos:7
package: rpm
package-distro: el7
artifact-from: rhel-7

# Alpine
- label: alpine
base-image: alpine:3.16
package: apk
artifact-from: alpine
# Debian
- label: debian
base-image: debian:11-slim
package: deb
artifact-from: debian-11

# RHEL
- label: rhel
base-image: centos:7
package: rpm
rpm_platform: el7
artifact-from: rhel-7
docker-platforms: linux/amd64

smoke-tests:
- label: ubuntu
- label: debian
- label: rhel
- label: alpine

scan-vulnerabilities:
- label: ubuntu
- label: debian
- label: rhel
- label: alpine

release-packages:
# Ubuntu
- label: ubuntu-20.04
package: deb
artifact-from: ubuntu-20.04
artifact-version: 20.04
artifact-type: ubuntu
artifact: kong.amd64.deb
- label: ubuntu-22.04
package: deb
artifact-from: ubuntu-22.04
artifact-version: 22.04
artifact-type: ubuntu
artifact: kong.amd64.deb

# Debian
- label: debian-10
package: deb
artifact-from: debian-10
artifact-version: 10
artifact-type: debian
artifact: kong.amd64.deb
- label: debian-11
package: deb
artifact-from: debian-11
artifact-version: 11
artifact-type: debian
artifact: kong.amd64.deb

# CentOS
- label: centos-7
package: rpm
artifact-from: centos-7
artifact-version: 7
artifact-type: centos
artifact: kong.el7.amd64.rpm

# RHEL
- label: rhel-7
package: rpm
artifact-from: rhel-7
artifact-version: 7
artifact-type: rhel
artifact: kong.el7.amd64.rpm
- label: rhel-8
package: rpm
artifact-from: rhel-8
artifact-version: 8
artifact-type: rhel
artifact: kong.el8.amd64.rpm

# Amazon Linux
- label: amazonlinux-2
package: rpm
artifact-from: amazonlinux-2
artifact-version: 2
artifact-type: amazonlinux
artifact: kong.aws2.amd64.rpm
- label: amazonlinux-2023
package: rpm
artifact-from: amazonlinux-2023
artifact-version: 2023
artifact-type: amazonlinux
artifact: kong.aws2023.amd64.rpm

# Alpine
- label: alpine
package: apk
Expand All @@ -198,12 +44,5 @@ release-packages:
artifact: kong.amd64.apk.tar.gz

release-images:
- label: centos7
package: rpm
- label: rhel7
package: rpm
- label: alpine
package: apk
- label: ubuntu
- label: debian
- label: rhel
79 changes: 79 additions & 0 deletions build/openresty/patches/nginx-cross-endianness-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# http://cgit.openembedded.org/meta-openembedded/tree/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
From be9970aa16c5142ef814531d74a07990a8e9eb14 Mon Sep 17 00:00:00 2001
From: Derek Straka <[email protected]>
Date: Fri, 1 Dec 2017 10:32:29 -0500
Subject: [PATCH] Allow the overriding of the endianness via the configure flag
--with-endian

The existing configure options contain the --with-endian; however, the command
line flag does not actually function. It does not set the endianness and it
appears to do nothing.

Upstream-Status: Pending

Signed-off-by: Derek Straka <[email protected]>

diff --git a/auto/endianness b/auto/endianness
index 1b552b6..be84487 100644
--- a/bundle/nginx-1.19.9/endianness
+++ b/bundle/nginx-1.19.9/auto/endianness
@@ -13,7 +13,13 @@ checking for system byte ordering
END


-cat << END > $NGX_AUTOTEST.c
+if [ ".$NGX_WITH_ENDIAN" = ".little" ]; then
+ echo " little endian"
+ have=NGX_HAVE_LITTLE_ENDIAN . auto/have
+elif [ ".$NGX_WITH_ENDIAN" = ".big" ]; then
+ echo " big endian"
+else
+ cat << END > $NGX_AUTOTEST.c

int main(void) {
int i = 0x11223344;
@@ -26,25 +32,26 @@ int main(void) {

END

-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
+ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"

-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"

-if [ -x $NGX_AUTOTEST ]; then
- if $NGX_AUTOTEST >/dev/null 2>&1; then
- echo " little endian"
- have=NGX_HAVE_LITTLE_ENDIAN . auto/have
- else
- echo " big endian"
- fi
+ if [ -x $NGX_AUTOTEST ]; then
+ if $NGX_AUTOTEST >/dev/null 2>&1; then
+ echo " little endian"
+ have=NGX_HAVE_LITTLE_ENDIAN . auto/have
+ else
+ echo " big endian"
+ fi

- rm -rf $NGX_AUTOTEST*
+ rm -rf $NGX_AUTOTEST*

-else
- rm -rf $NGX_AUTOTEST*
+ else
+ rm -rf $NGX_AUTOTEST*

- echo
- echo "$0: error: cannot detect system byte ordering"
- exit 1
+ echo
+ echo "$0: error: cannot detect system byte ordering"
+ exit 1
+ fi
fi
--
2.7.4
3 changes: 3 additions & 0 deletions build/tests/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ it_runs_full_enterprise() {
admin_api_http2_validity() {
output=$(mktemp)
header_dump=$(mktemp)
echo "!!!!!!!!!"
echo "curl -ks -D \"$header_dump\" -o \"$output\" -w '%{http_code}' \"$KONG_ADMIN_HTTP2_URI\""
echo "~~~!!!!!!!!!"
status=$(curl -ks -D "$header_dump" -o "$output" -w '%{http_code}' "$KONG_ADMIN_HTTP2_URI")

msg_test "it returns with response status code 200"
Expand Down

0 comments on commit b36cc8c

Please sign in to comment.