From 0ac5986b18a772b3b0dd34539b0a0cb10ad1eb60 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 27 Apr 2023 19:17:42 +0200 Subject: [PATCH] Add crossbuild variable --- .github/workflows/platform_natives.yaml | 23 +++++++++++-------- Dockerfile | 2 ++ .../docker/setup-platform-variables.sh | 3 +++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index db77bfa..23c1542 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -13,16 +13,16 @@ jobs: strategy: matrix: include: - - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", arch: "linux/386", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", arch: "linux/amd64", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", arch: "linux/armhf", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", arch: "linux/arm64", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", arch: "linux/s390x", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", arch: "linux/ppc64le", implementation: "tdlight"} - - {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", arch: "linux/amd64", implementation: "tdlight"} - - {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", arch: "linux/arm64", implementation: "tdlight"} - - {os: windows-2019, usedocker: "false", ssl: "ssl1", useqemu: "false", arch: "amd64", implementation: "tdlight", vcpkgCommitId: "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", triplet: "x64-windows-static"} - - {os: macos-12, usedocker: "false", ssl: "ssl1", useqemu: "false", arch: "amd64", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "linux/386", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "linux/amd64", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "linux/armhf", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "linux/arm64", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "linux/s390x", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "linux/ppc64le", implementation: "tdlight"} + - {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", crossbuild: "false", arch: "linux/amd64", implementation: "tdlight"} + - {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", crossbuild: "false", arch: "linux/arm64", implementation: "tdlight"} + - {os: windows-2019, usedocker: "false", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "amd64", implementation: "tdlight", vcpkgCommitId: "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", triplet: "x64-windows-static"} + - {os: macos-12, usedocker: "false", ssl: "ssl1", useqemu: "false", crossbuild: "false", arch: "amd64", implementation: "tdlight"} steps: - name: Checkout current repo uses: actions/checkout@v2 @@ -125,6 +125,7 @@ jobs: GH_MATRIX_OS=${{ matrix.os }} GH_MATRIX_ARCH=${{ matrix.arch }} GH_MATRIX_SSL=${{ matrix.ssl }} + GH_CROSSBUILD=${{ matrix.crossbuild }} IMPLEMENTATION_NAME=${{ matrix.implementation }} - name: Extract jni from docker image @@ -159,6 +160,7 @@ jobs: export GH_MATRIX_OS=${{ matrix.os }} export GH_MATRIX_ARCH=${{ matrix.arch }} export GH_MATRIX_SSL=${{ matrix.ssl }} + export GH_CROSSBUILD=${{ matrix.crossbuild }} export IMPLEMENTATION_NAME=${{ matrix.implementation }} source ./scripts/continuous-integration/github-workflows/setup-variables.sh @@ -185,6 +187,7 @@ jobs: echo "MAVEN_OPTS=$MAVEN_OPTS" >> $GITHUB_ENV echo "GH_CPU_ARCH=$GH_CPU_ARCH" >> $GITHUB_ENV echo "SSL_TYPE=$GH_MATRIX_SSL" >> $GITHUB_ENV + echo "CROSSBUILD=$GH_CROSSBUILD" >> $GITHUB_ENV echo "CPU_ARCH_JAVA=$CPU_ARCH_JAVA" >> $GITHUB_ENV echo "CPU_ARCHITECTURE_NAME=$CPU_ARCHITECTURE_NAME" >> $GITHUB_ENV echo "CPU_CORES_NUM=$CPU_CORES_NUM" >> $GITHUB_ENV diff --git a/Dockerfile b/Dockerfile index 8f42505..d6d5dbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ ARG GH_MATRIX_SSL +ARG GH_CROSSBUILD FROM debian:buster as img_ssl1 ONBUILD ENV SSL_LIB_NAME=libssl1.1 @@ -12,6 +13,7 @@ ARG GH_MATRIX_ARCH ARG GH_MATRIX_SSL ARG IMPLEMENTATION_NAME ARG CPU_CORES_NUM +ARG GH_CROSSBUILD ENV DEBIAN_FRONTEND noninteractive diff --git a/scripts/continuous-integration/docker/setup-platform-variables.sh b/scripts/continuous-integration/docker/setup-platform-variables.sh index 3259252..7a278f8 100644 --- a/scripts/continuous-integration/docker/setup-platform-variables.sh +++ b/scripts/continuous-integration/docker/setup-platform-variables.sh @@ -1,4 +1,7 @@ #!/bin/bash -e +if [[ -n ${GH_CROSSBUILD} ]]; then + export CROSS_BUILD_DEPS_DIR="" +fi source ./scripts/continuous-integration/github-workflows/setup-variables.sh export JAVA_HOME