Skip to content

Commit f831808

Browse files
committed
build openssl separately
1 parent 20a4987 commit f831808

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

.github/workflows/Linux.yml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
arch: ['linux_amd64', 'linux_arm64', 'linux_amd64_gcc4']
2828
include:
2929
- arch: 'linux_amd64'
30-
container: 'ubuntu:18.04'
30+
container: 'ubuntu:16.04'
3131
- arch: 'linux_arm64'
3232
container: 'ubuntu:18.04'
3333
- arch: 'linux_amd64_gcc4'
@@ -82,13 +82,34 @@ jobs:
8282
uses: ./duckdb/.github/actions/ubuntu_16_setup
8383
with:
8484
aarch64_cross_compile: ${{ matrix.arch == 'linux_arm64' && 1 }}
85-
openssl: 1
85+
openssl: 0
8686

87-
- name: Configure OpenSSL path
87+
# Openssl install dir was weirdly configured in main duckdb?
88+
- name: Install OpenSSL 1.1.1
89+
if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64'}}
90+
shell: bash
91+
run: |
92+
wget https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1s.tar.gz
93+
tar -xzvf OpenSSL_1_1_1s.tar.gz
94+
mv openssl-OpenSSL_1_1_1s openssl-1.1.1s
95+
cd openssl-1.1.1s
96+
find ./ -type f -exec sed -i -e 's/\#\ define\ OPENSSL\_VERSION\_NUMBER/\#define\ OPENSSL\_VERSION\_NUMBER/g' {} \;
97+
./config --libdir=lib no-shared zlib-dynamic
98+
make
99+
make install
100+
101+
- name: Configure OpenSSL path for ARM64
102+
if: ${{ matrix.arch == 'linux_arm64' }}
103+
shell: bash
104+
run: |
105+
export OPENSSL_ROOT_DIR=`pwd`/build/openssl/build
106+
echo "OPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR" >> $GITHUB_ENV
107+
108+
- name: Configure OpenSSL path for AMD64
109+
if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_amd64_gcc4'}}
88110
shell: bash
89111
run: |
90-
export OPENSSL_ROOT_DIR=`pwd`/build/openssl/build
91-
echo "OPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR" >> $GITHUB_ENV
112+
echo "OPENSSL_ROOT_DIR=/usr/local/ssl" >> $GITHUB_ENV
92113
93114
# Build extension
94115
- name: Build extension

0 commit comments

Comments
 (0)