Use docker with debian buster

This commit is contained in:
Andrea Cavalli 2021-09-26 00:56:40 +02:00
parent 8ba1fb9dc4
commit 0826fbd980
2 changed files with 26 additions and 22 deletions

View File

@ -12,22 +12,22 @@ jobs:
strategy:
matrix:
include:
- {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"}
- {os: macos-10.15, usedocker: "false", arch: "amd64", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/386", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/386", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/amd64", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/amd64", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/armhf", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/armhf", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/arm64", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/arm64", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/s390x", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/s390x", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/ppc64le", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", useqemu: "false", arch: "linux/ppc64le", implementation: "tdlib"}
- {os: windows-2019, usedocker: "false", useqemu: "false", arch: "amd64", implementation: "tdlight", vcpkgCommitId: "30124253eecff36bc90f73341edbfb4f845e2a1e", triplet: "x64-windows-static"}
- {os: windows-2019, usedocker: "false", useqemu: "false", arch: "amd64", implementation: "tdlib", vcpkgCommitId: "30124253eecff36bc90f73341edbfb4f845e2a1e", triplet: "x64-windows-static"}
- {os: macos-10.15, usedocker: "false", useqemu: "false", arch: "amd64", implementation: "tdlight"}
- {os: macos-10.15, usedocker: "false", useqemu: "false", arch: "amd64", implementation: "tdlib"}
steps:
- name: Checkout current repo
uses: actions/checkout@v2
@ -69,7 +69,7 @@ jobs:
cat $GITHUB_ENV > github.env
- name: Set up QEMU
if: matrix.usedocker == 'true'
if: matrix.usedocker == 'true' && matrix.useqemu == 'true'
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx

View File

@ -12,15 +12,14 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt update && apt upgrade -y
RUN apt install -y sudo openjdk-11-jdk locales
#RUN apt install -y make git zlib1g-dev libssl-dev gperf cmake clang-10 libc++-10-dev libc++abi-10-dev ccache maven python3 python3-pip php7.4-cli openjdk-15-jdk
RUN apt install -y sudo build-essential openjdk-11-jdk locales wget cmake gperf ccache maven
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales && \
update-locale LANG=en_US.UTF-8
ENV LANG en_US.UTF-8
ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
ENV LANG "en_US.UTF-8"
ENV JAVA_TOOL_OPTIONS "-Dfile.encoding=UTF8"
ADD implementations /usr/src/tdlight-java-natives/implementations
ADD scripts /usr/src/tdlight-java-natives/scripts
@ -28,7 +27,12 @@ ADD src /usr/src/tdlight-java-natives/src
WORKDIR /usr/src/tdlight-java-natives/
RUN /bin/bash -c "export JAVA_HOME=\"/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep openjdk | head -n 1)/\"; export JAVA_INCLUDE_PATH=\"$JAVA_HOME/include\"; source ./scripts/continuous-integration/github-workflows/setup-variables.sh; source ./scripts/continuous-integration/github-workflows/install-dependencies.sh; source ./scripts/continuous-integration/github-workflows/build-natives.sh"
RUN /bin/bash -c "export JAVA_HOME=\"/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep openjdk | head -n 1)/\"; \
export JAVA_INCLUDE_PATH=\"$JAVA_HOME/include\"; \
source ./scripts/continuous-integration/github-workflows/setup-variables.sh; \
sudo apt install -y crossbuild-essential-${CPU_ARCH_DPKG}; \
source ./scripts/continuous-integration/github-workflows/install-dependencies.sh; \
source ./scripts/continuous-integration/github-workflows/build-natives.sh"
#WORKDIR /usr/src/tdlight-java-natives/generated/
#RUN echo "aaaa" > test.txt