Revert "Revert "fix(ci): remove Lua cURL and CI modifications because…

… of it (Kong#10599)" (Kong#11167)" (Kong#11169) This reverts commit 702674a.
softprog · Jul 3, 2023 · 66f7024 · 66f7024
1 parent 702674a
commit 66f7024
Show file tree

Hide file tree

Showing 8 changed files with 183 additions and 186 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -9,5 +9,4 @@ RUN apt-get install -y \
         unzip \
         git \
         m4 \
-        libyaml-dev \
-        libcurl4-openssl-dev
+        libyaml-dev
diff --git a/.github/workflows/autodocs.yml b/.github/workflows/autodocs.yml
@@ -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'

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,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'

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -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'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -192,7 +192,6 @@ jobs:
                 curl \
                 file \
                 libyaml-dev \
-                libcurl4-openssl-dev \
                 m4 \
                 perl \
                 pkg-config \
@@ -209,7 +208,7 @@ jobs:
       run: |
         yum groupinstall -y 'Development Tools'
         dnf config-manager --set-enabled powertools || true # enable devel packages on rockylinux:8
-        yum install -y libyaml-devel curl-devel
+        yum install -y libyaml-devel
         yum install -y cpanminus || (yum install -y perl && curl -L https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm | perl - App::cpanminus) # amazonlinux2023 removed cpanminus
         # required for openssl 3.x config
         cpanm IPC/Cmd.pm

diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -96,7 +96,6 @@ sudo apt update \
     file \
     git \
     libyaml-dev \
-    libcurl4-openssl-dev \
     libprotobuf-dev \
     m4 \
     perl \
@@ -117,7 +116,6 @@ dnf install \
     gcc-c++ \
     git \
     libyaml-devel \
-    curl-devel \
     make \
     patch \
     perl \
@@ -138,7 +136,6 @@ macOS
 /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:

diff --git a/Makefile b/Makefile
@@ -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.1" "lua-llthreads2 0.1.6" "http 0.4" "ldoc 1.5.0" "luacov 0.15.0" "Lua-cURL 0.3.13"
+DEV_ROCKS = "busted 2.1.2" "busted-htest 1.0.0" "luacheck 1.1.1" "lua-llthreads2 0.1.6" "http 0.4" "ldoc 1.5.0" "luacov 0.15.0"
 WIN_SCRIPTS = "bin/busted" "bin/kong" "bin/kong-health"
 BUSTED_ARGS ?= -v
 TEST_CMD ?= bin/busted $(BUSTED_ARGS)
@@ -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)
@@ -86,7 +84,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;
 
@@ -169,11 +167,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