From 27cdc1e7c2d773ce4780e48992a70fda6086a4a2 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 15 Sep 2021 12:50:26 +0200 Subject: [PATCH] Update github actions to Ubuntu 20.04 (Focal) --- .github/workflows/platform_natives.yaml | 24 ++++++------ .github/workflows/tdapi_file.yaml | 4 +- scripts/core/install-dependencies.sh | 49 ++++++++++--------------- scripts/core/setup-variables.sh | 16 ++++++++ 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 047244e..e2824dd 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -12,18 +12,18 @@ jobs: strategy: matrix: include: - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/386", implementation: "tdlight"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/386", implementation: "tdlib"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlight"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlib"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/armhf", implementation: "tdlight"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/armhf", implementation: "tdlib"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/arm64", implementation: "tdlight"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/arm64", implementation: "tdlib"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/s390x", implementation: "tdlight"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/s390x", implementation: "tdlib"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/ppc64le", implementation: "tdlight"} - - {os: ubuntu-18.04, usedocker: "false", arch: "linux/ppc64le", implementation: "tdlib"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/386", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/386", implementation: "tdlib"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlib"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/armhf", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/armhf", implementation: "tdlib"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/arm64", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/arm64", implementation: "tdlib"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/s390x", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/s390x", implementation: "tdlib"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/ppc64le", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "false", arch: "linux/ppc64le", implementation: "tdlib"} - {os: windows-2019, usedocker: "false", arch: "amd64", implementation: "tdlight", vcpkgCommitId: "30124253eecff36bc90f73341edbfb4f845e2a1e", triplet: "x64-windows-static"} - {os: windows-2019, usedocker: "false", arch: "amd64", implementation: "tdlib", vcpkgCommitId: "30124253eecff36bc90f73341edbfb4f845e2a1e", triplet: "x64-windows-static"} - {os: macos-10.15, usedocker: "false", arch: "amd64", implementation: "tdlight"} diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml index 6848ba9..884f8b6 100644 --- a/.github/workflows/tdapi_file.yaml +++ b/.github/workflows/tdapi_file.yaml @@ -8,8 +8,8 @@ jobs: strategy: matrix: include: - - {os: ubuntu-18.04, arch: "linux/amd64", implementation: "tdlight"} - - {os: ubuntu-18.04, arch: "linux/amd64", implementation: "tdlib"} + - {os: ubuntu-20.04, arch: "linux/amd64", implementation: "tdlight"} + - {os: ubuntu-20.04, arch: "linux/amd64", implementation: "tdlib"} runs-on: ${{ matrix.os }} steps: - name: Install sudo package diff --git a/scripts/core/install-dependencies.sh b/scripts/core/install-dependencies.sh index ba59dc6..841456d 100755 --- a/scripts/core/install-dependencies.sh +++ b/scripts/core/install-dependencies.sh @@ -64,23 +64,21 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then rm -rf "$CROSS_BUILD_DEPS_DIR" || true mkdir -p "$CROSS_BUILD_DEPS_DIR" echo " -deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse -deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse -deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse -deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu bionic-security main restricted universe multiverse +deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse +deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse +deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse +deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu focal-security main restricted universe multiverse -deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe multiverse -deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe multiverse -deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted universe multiverse -deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse " | sudo tee /etc/apt/sources.list sudo dpkg --add-architecture "${CPU_ARCH_DPKG}" sudo apt-get update || true sudo apt-get install -y openjdk-8-jdk sudo apt-get install -y "libstdc++-8-dev-${CPU_ARCH_DPKG}-cross" "libstdc++-8-pic-${CPU_ARCH_DPKG}-cross" - if [[ "${CPU_ARCHITECTURE_NAME}" != "amd64" && "${CPU_ARCHITECTURE_NAME}" != "386" ]]; then - sudo apt-get install -y "crossbuild-essential-${CPU_ARCH_DPKG}" - fi + sudo apt-get install -y "crossbuild-essential-${CPU_ARCH_DPKG}" cd "$CROSS_BUILD_DEPS_DIR" # LibZ-Dev apt-get download "zlib1g-dev:${CPU_ARCH_DPKG}" @@ -145,22 +143,15 @@ deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bioni echo "Creating toolchain file..." cd "$ROOT_DIR" { - echo "set(CMAKE_SYSTEM_PROCESSOR ${CPU_ARCH_CMAKE})"; - if [[ "$CPU_ARCHITECTURE_NAME" == "386" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "amd64" ]]; then - echo "set(CMAKE_C_COMPILER gcc)"; - echo "set(CMAKE_C_COMPILER_TARGET ${CLANG_TRIPLE})"; - echo "set(CMAKE_CXX_COMPILER g++)"; - echo "set(CMAKE_CXX_COMPILER_TARGET ${CLANG_TRIPLE})"; - else - echo "set(CMAKE_C_COMPILER ${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-gcc)"; - echo "set(CMAKE_C_COMPILER_TARGET ${CLANG_TRIPLE})"; - echo "set(CMAKE_CXX_COMPILER ${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++)"; - echo "set(CMAKE_CXX_COMPILER_TARGET ${CLANG_TRIPLE})"; - echo "set(CMAKE_ASM_COMPILER ${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++)"; - echo "set(CMAKE_ASM_COMPILER_TARGET ${CLANG_TRIPLE})"; - fi + echo "set(CMAKE_SYSTEM_PROCESSOR ${CPU_ARCH_LINUX})"; + echo "set(CMAKE_C_COMPILER ${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-gcc)"; + echo "set(CMAKE_C_COMPILER_TARGET ${CLANG_TRIPLE})"; + echo "set(CMAKE_CXX_COMPILER ${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++)"; + echo "set(CMAKE_CXX_COMPILER_TARGET ${CLANG_TRIPLE})"; + echo "set(CMAKE_ASM_COMPILER ${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++)"; + echo "set(CMAKE_ASM_COMPILER_TARGET ${CLANG_TRIPLE})"; echo "set(CMAKE_LIBRARY_PATH \"$CROSS_BUILD_DEPS_DIR/\")"; - echo "include_directories(\"${CROSS_BUILD_DEPS_DIR}/usr/include/${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}/\")"; + echo "include_directories(\"${CROSS_BUILD_DEPS_DIR}/usr/include/${CPU_ARCH_LINUX}-linux-${CPU_COMPILATION_TOOL}/\")"; echo "SET(CMAKE_FIND_ROOT_PATH \"$CROSS_BUILD_DEPS_DIR\" \"$JAVA_HOME\" \"/\" \"/usr/lib/jvm/java-8-openjdk-amd64/include\")"; echo "include_directories(\"${CROSS_OPENJDK_PATH}/include\")"; echo "include_directories(\"${CROSS_OPENJDK_PATH}/include/linux\")"; @@ -169,19 +160,19 @@ deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bioni echo "SET(JAVA_INCLUDE_PATH \"/usr/lib/jvm/java-8-openjdk-amd64/include\")"; echo "SET(JAVA_AWT_INCLUDE_PATH \"/usr/lib/jvm/java-8-openjdk-amd64/include\")"; echo "SET(JAVA_INCLUDE_PATH2 \"/usr/lib/jvm/java-8-openjdk-amd64/include/linux\")"; - #echo "SET(JAVA_JVM_LIBRARY \"/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so\")"; + #echo "SET(JAVA_JVM_LIBRARY \"/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/${JAVA_INSTALLATION_TYPE}/libjvm.so\")"; #echo "SET(JAVA_AWT_LIBRARY \"/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/libawt.so\")"; #echo "SET(JAVA_HOME \"$CROSS_OPENJDK_PATH\")"; #echo "SET(JAVA_INCLUDE_PATH \"$CROSS_OPENJDK_PATH/include\")"; #echo "SET(JAVA_INCLUDE_PATH2 \"$CROSS_OPENJDK_PATH/include/linux\")"; - echo "SET(JAVA_JVM_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/server/libjvm.so\")"; + echo "SET(JAVA_JVM_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/${JAVA_INSTALLATION_TYPE}/libjvm.so\")"; echo "SET(JAVA_AWT_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/libawt.so\")"; #echo "SET(JNI_INCLUDE_DIRS \"$CROSS_OPENJDK_PATH/include\" \"$CROSS_OPENJDK_PATH/include/linux\")"; #echo "SET(Java_JAR_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/java\")"; #echo "SET(Java_JAVAC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javac\")"; #echo "SET(Java_JAVADOC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javadoc\")"; - #echo "SET(JNI_LIBRARIES \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/server/libjvm.so\" \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/libawt.so\")"; + #echo "SET(JNI_LIBRARIES \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/${JAVA_INSTALLATION_TYPE}/libjvm.so\" \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/libawt.so\")"; #echo "SET(JNI_FOUND True)"; #echo "MESSAGE(STATUS \"JNI INCLUDE DIRS: \${JNI_INCLUDE_DIRS}\")"; #echo "MESSAGE(STATUS \"JNI LIBS: \${JNI_LIBRARIES}\")"; diff --git a/scripts/core/setup-variables.sh b/scripts/core/setup-variables.sh index b5fd03f..6ab9280 100755 --- a/scripts/core/setup-variables.sh +++ b/scripts/core/setup-variables.sh @@ -12,43 +12,55 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then if [[ "$CPU_ARCHITECTURE_NAME" == "aarch64" ]]; then export CPU_ARCH_JAVA="arm64" export CPU_ARCH_JAVA_INTERNAL="aarch64" + export JAVA_INSTALLATION_TYPE="server" export CPU_ARCH_DPKG="arm64" export CPU_ARCH_CMAKE="aarch64" + export CPU_ARCH_LINUX="aarch64" export CLANG_TRIPLE="aarch64-linux-gnu" export CPU_COMPILATION_TOOL="gnu" elif [[ "$CPU_ARCHITECTURE_NAME" == "armhf" ]]; then export CPU_ARCH_JAVA="armhf" export CPU_ARCH_JAVA_INTERNAL="arm" + export JAVA_INSTALLATION_TYPE="client" export CPU_ARCH_DPKG="armhf" export CPU_ARCH_CMAKE="arm" + export CPU_ARCH_LINUX="arm" export CLANG_TRIPLE="arm-linux-gnueabihf" export CPU_COMPILATION_TOOL="gnueabihf" elif [[ "$CPU_ARCHITECTURE_NAME" == "s390x" ]]; then export CPU_ARCH_JAVA="s390x" export CPU_ARCH_JAVA_INTERNAL="s390x" + export JAVA_INSTALLATION_TYPE="server" export CPU_ARCH_DPKG="s390x" export CPU_ARCH_CMAKE="s390x" + export CPU_ARCH_LINUX="s390x" export CLANG_TRIPLE="s390x-linux-gnu" export CPU_COMPILATION_TOOL="gnu" elif [[ "$CPU_ARCHITECTURE_NAME" == "386" ]]; then export CPU_ARCH_JAVA="386" export CPU_ARCH_JAVA_INTERNAL="i386" + export JAVA_INSTALLATION_TYPE="server" export CPU_ARCH_DPKG="i386" export CPU_ARCH_CMAKE="i686" + export CPU_ARCH_LINUX="i386" export CLANG_TRIPLE="i386-linux-gnu" export CPU_COMPILATION_TOOL="gnu" elif [[ "$CPU_ARCHITECTURE_NAME" == "amd64" ]]; then export CPU_ARCH_JAVA="amd64" export CPU_ARCH_JAVA_INTERNAL="amd64" + export JAVA_INSTALLATION_TYPE="server" export CPU_ARCH_DPKG="amd64" export CPU_ARCH_CMAKE="x86_64" + export CPU_ARCH_LINUX="x86_64" export CLANG_TRIPLE="x86_64-linux-gnu" export CPU_COMPILATION_TOOL="gnu" elif [[ "$CPU_ARCHITECTURE_NAME" == "ppc64le" ]]; then export CPU_ARCH_JAVA="ppc64le" export CPU_ARCH_JAVA_INTERNAL="ppc64le" + export JAVA_INSTALLATION_TYPE="server" export CPU_ARCH_DPKG="ppc64el" export CPU_ARCH_CMAKE="powerpc64le" + export CPU_ARCH_LINUX="powerpc64le" export CLANG_TRIPLE="powerpc64-linux-gnu" export CPU_COMPILATION_TOOL="gnu" else @@ -88,9 +100,13 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then echo "========= Variables =========" echo "Variables" echo "CPU_ARCH_JAVA=${CPU_ARCH_JAVA}" + echo "CPU_ARCH_JAVA_INTERNAL=${CPU_ARCH_JAVA_INTERNAL}" + echo "JAVA_INSTALLATION_TYPE=${JAVA_INSTALLATION_TYPE}" echo "CPU_ARCH_DPKG=${CPU_ARCH_DPKG}" echo "CPU_ARCH_CMAKE=${CPU_ARCH_CMAKE}" + echo "CPU_ARCH_LINUX=${CPU_ARCH_LINUX}" echo "CLANG_TRIPLE=${CLANG_TRIPLE}" + echo "CPU_COMPILATION_TOOL=${CPU_COMPILATION_TOOL}" echo "CC=${CC}" echo "CXX=${CXX}" echo "CXXFLAGS=${CXXFLAGS}"