|
27 | 27 | arch: ['linux_amd64', 'linux_arm64', 'linux_amd64_gcc4'] |
28 | 28 | include: |
29 | 29 | - arch: 'linux_amd64' |
30 | | - container: 'ubuntu:18.04' |
| 30 | + container: 'ubuntu:16.04' |
31 | 31 | - arch: 'linux_arm64' |
32 | 32 | container: 'ubuntu:18.04' |
33 | 33 | - arch: 'linux_amd64_gcc4' |
@@ -82,13 +82,34 @@ jobs: |
82 | 82 | uses: ./duckdb/.github/actions/ubuntu_16_setup |
83 | 83 | with: |
84 | 84 | aarch64_cross_compile: ${{ matrix.arch == 'linux_arm64' && 1 }} |
85 | | - openssl: 1 |
| 85 | + openssl: 0 |
86 | 86 |
|
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'}} |
88 | 110 | shell: bash |
89 | 111 | 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 |
92 | 113 |
|
93 | 114 | # Build extension |
94 | 115 | - name: Build extension |
|
0 commit comments