From 6746b72e64d9cb1a0278fefc364404805a057090 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Mon, 13 Dec 2021 01:11:47 +0200 Subject: [PATCH] Try to enable ARM builds --- .github/workflows/docker-image.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- example/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index e6e1e99..0138d59 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -44,7 +44,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/386,linux/amd64 + platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64 push: true cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/Dockerfile b/Dockerfile index b991956..6be3c33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ COPY telegram-bot-api /usr/src/telegram-bot-api RUN mkdir -p build \ && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=.. .. \ - && cmake --build . --target install -j $(nproc) \ + && cmake --build . --target install -j $(($(nproc) + 2)) \ && strip /usr/src/telegram-bot-api/bin/telegram-bot-api FROM alpine:3.12 diff --git a/Makefile b/Makefile index 9f65d74..5bd786d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ image_tag := $(shell date +%Y%m%d) .PHONY: update update: - git submodule update --init --recursive --remote --merge + git submodule -q foreach git pull -q origin master .PHONY: build build: diff --git a/example/README.md b/example/README.md index 2d26dee..f29a9e8 100644 --- a/example/README.md +++ b/example/README.md @@ -1,6 +1,6 @@ # Example -By default [tdlib/telegram-bot-api](https://github.com/tdlib/telegram-bot-api) +By default, [tdlib/telegram-bot-api](https://github.com/tdlib/telegram-bot-api) doesn't provide possibility to download files from API (without local-mode) so that's meat you will need to expose files somehow differently, for example by nginx.