diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 0587a65..4851d2b 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -12,8 +12,8 @@ jobs: strategy: matrix: include: - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlight" } - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlib" } + - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlight"} + - {os: ubuntu-20.04, usedocker: "true", 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: "true", arch: "linux/arm/v6", implementation: "tdlight"} diff --git a/scripts/continuous-integration/github-workflows/setup-variables.sh b/scripts/continuous-integration/github-workflows/setup-variables.sh index e60371a..8bd730a 100644 --- a/scripts/continuous-integration/github-workflows/setup-variables.sh +++ b/scripts/continuous-integration/github-workflows/setup-variables.sh @@ -95,7 +95,7 @@ elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then if { [[ "$IMPLEMENTATION_NAME" = "tdlib" ]]; } && { [[ "$CPU_ARCHITECTURE_NAME" = "386" ]] || [[ "$CPU_ARCHITECTURE_NAME" = "armv6" ]] || [[ "$CPU_ARCHITECTURE_NAME" = "armv7" ]]; }; then export CXXFLAGS="$CXXFLAGS" else - export CXXFLAGS="-static-libgcc -static-libstdc++" + export CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" export CC="/usr/bin/clang-11" export CXX="/usr/bin/clang++-11" fi