tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Update github actions to Ubuntu 22.04 and OpenSSL3

Browse Source
This commit is contained in:
Andrea Cavalli 2023-02-08 17:24:08 +01:00
parent 4a1ec6fce4
commit d0f90ada40
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,8 +1,8 @@
ARG GH_MATRIX_SSL ARG GH_MATRIX_SSL
FROM debian:oldstable as img_ssl1 FROM debian:buster as img_ssl1
ONBUILD ENV SSL_LIB_NAME=libssl1.1 ONBUILD ENV SSL_LIB_NAME=libssl1.1
FROM ubuntu:jammy as img_ssl3 FROM debian:bookworm as img_ssl3
ONBUILD ENV SSL_LIB_NAME=libssl3 ONBUILD ENV SSL_LIB_NAME=libssl3
FROM img_${GH_MATRIX_SSL} AS build FROM img_${GH_MATRIX_SSL} AS build

2
scripts/continuous-integration/docker/install-dependencies.sh
View File

@ -28,7 +28,7 @@ if [ -n "${CROSS_BUILD_DEPS_DIR}" ]; then
PWD_BEFORE_CROSS_DEPS=$(pwd) PWD_BEFORE_CROSS_DEPS=$(pwd)
if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-013" ]]; then if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-013" ]]; then
echo "Setting up cross build deps dir" echo "Setting up cross build deps dir"
rm -rf "$CROSS_BUILD_DEPS_DIR" || true find "$CROSS_BUILD_DEPS_DIR" -mindepth 1 -delete || true
mkdir -p "$CROSS_BUILD_DEPS_DIR" mkdir -p "$CROSS_BUILD_DEPS_DIR"
cd "$CROSS_BUILD_DEPS_DIR" cd "$CROSS_BUILD_DEPS_DIR"