Skip to content

Commit

Permalink
fix(ci): remove Lua cURL and CI modifications because of it (#10599)
Browse files Browse the repository at this point in the history
### Summary

Master is currently red because of #10595 (was green when merged),
this is a final attempt to fix it, but disabling Lua cURL tests,
and removing the CI modifications because of it. We need to get
back on board to get it right.

Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
  • Loading branch information
bungle authored Mar 31, 2023
1 parent b345d08 commit fa2c371
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 186 deletions.
3 changes: 1 addition & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ RUN apt-get install -y \
unzip \
git \
m4 \
libyaml-dev \
libcurl4-openssl-dev
libyaml-dev
2 changes: 1 addition & 1 deletion .github/workflows/autodocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

- name: Install packages
if: steps.cache-deps.outputs.cache-hit != 'true' || github.event.inputs.force_build == 'true'
run: sudo apt update && sudo apt install libyaml-dev valgrind libcurl4-openssl-dev
run: sudo apt update && sudo apt install libyaml-dev valgrind

- name: Build Kong dependencies
if: steps.cache-deps.outputs.cache-hit != 'true' || github.event.inputs.force_build == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: Install packages
if: steps.cache-deps.outputs.cache-hit != 'true'
run: sudo apt update && sudo apt install libyaml-dev valgrind libprotobuf-dev libcurl4-openssl-dev
run: sudo apt update && sudo apt install libyaml-dev valgrind libprotobuf-dev

- name: Build Kong
if: steps.cache-deps.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Install packages
if: steps.cache-deps.outputs.cache-hit != 'true'
run: sudo apt update && sudo apt install libyaml-dev valgrind libprotobuf-dev libcurl4-openssl-dev
run: sudo apt update && sudo apt install libyaml-dev valgrind libprotobuf-dev

- name: Build OpenResty
if: steps.cache-deps.outputs.cache-hit != 'true'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ jobs:
curl \
file \
libyaml-dev \
libcurl4-openssl-dev \
m4 \
perl \
pkg-config \
Expand All @@ -197,7 +196,6 @@ jobs:
yum groupinstall -y 'Development Tools'
dnf config-manager --set-enabled powertools || true # enable devel packages on rockylinux:8
yum install -y libyaml-devel
yum install -y curl-devel
- name: Setup Amazon Linux
if: startsWith(matrix.label, 'amazonlinux')
Expand Down
3 changes: 0 additions & 3 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ sudo apt update \
file \
git \
libyaml-dev \
libcurl4-openssl-dev \
libprotobuf-dev \
m4 \
perl \
Expand All @@ -117,7 +116,6 @@ dnf install \
gcc-c++ \
git \
libyaml-devel \
curl-devel \
make \
patch \
perl \
Expand All @@ -137,7 +135,6 @@ xcode-select --install
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
# Build dependencies
brew install libyaml
brew install curl
```

Finally, we start the build process:
Expand Down
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OS := $(shell uname | awk '{print tolower($$0)}')
MACHINE := $(shell uname -m)

DEV_ROCKS = "busted 2.1.2" "busted-htest 1.0.0" "luacheck 1.1.0" "lua-llthreads2 0.1.6" "http 0.4" "ldoc 1.4.6" "Lua-cURL 0.3.13"
DEV_ROCKS = "busted 2.1.2" "busted-htest 1.0.0" "luacheck 1.1.0" "lua-llthreads2 0.1.6" "http 0.4" "ldoc 1.4.6"
WIN_SCRIPTS = "bin/busted" "bin/kong" "bin/kong-health"
BUSTED_ARGS ?= -v
TEST_CMD ?= bin/busted $(BUSTED_ARGS)
Expand All @@ -12,12 +12,10 @@ ifeq ($(OS), darwin)
OPENSSL_DIR ?= $(shell brew --prefix)/opt/openssl
GRPCURL_OS ?= osx
YAML_DIR ?= $(shell brew --prefix)/opt/libyaml
CURL_INCDIR ?= $(shell brew --prefix)/opt/curl/include
else
OPENSSL_DIR ?= /usr
GRPCURL_OS ?= $(OS)
YAML_DIR ?= /usr
CURL_INCDIR ?= /usr/include/x86_64-linux-gnu
endif

ifeq ($(MACHINE), aarch64)
Expand Down Expand Up @@ -79,7 +77,7 @@ install-dev-rocks: build-venv
else \
echo $$rock not found, installing via luarocks... ; \
LIBRARY_PREFIX=$$(pwd)/bazel-bin/build/$(BUILD_NAME)/kong ; \
luarocks install $$rock OPENSSL_DIR=$$LIBRARY_PREFIX CRYPTO_DIR=$$LIBRARY_PREFIX YAML_DIR=$(YAML_DIR) CURL_INCDIR=$(CURL_INCDIR) || exit 1; \
luarocks install $$rock OPENSSL_DIR=$$LIBRARY_PREFIX CRYPTO_DIR=$$LIBRARY_PREFIX YAML_DIR=$(YAML_DIR) || exit 1; \
fi \
done;

Expand Down Expand Up @@ -160,11 +158,11 @@ dependencies: bin/grpcurl
echo $$rock already installed, skipping ; \
else \
echo $$rock not found, installing via luarocks... ; \
luarocks install $$rock OPENSSL_DIR=$(OPENSSL_DIR) CRYPTO_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) CURL_INCDIR=$(CURL_INCDIR) || exit 1; \
luarocks install $$rock OPENSSL_DIR=$(OPENSSL_DIR) CRYPTO_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) || exit 1; \
fi \
done;

install-legacy:
@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) CRYPTO_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) CURL_INCDIR=$(CURL_INCDIR)
@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) CRYPTO_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR)

dev-legacy: remove install-legacy dependencies
Loading

1 comment on commit fa2c371

@khcp-gha-bot
Copy link

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:fa2c37192382582a8b2946e90564f509dd979b29
Artifacts available https://github.com/Kong/kong/actions/runs/4577764207

Please sign in to comment.