From a2ae002ff902a8556ce42c1118c9347389b88e43 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Mon, 29 Aug 2022 08:34:54 +0300 Subject: [PATCH] Fix ipctool building issues (#414) --- .github/workflows/matrix_build.yml | 2 +- general/package/ipctool/ipctool.mk | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 04eb4711..e899a1b6 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -523,7 +523,7 @@ jobs: TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} if: ${{ !env.ACT && failure() && github.event_name != 'pull_request' }} run: | - TG_OPTIONS="-s --connect-timeout 30 --max-time 30" + TG_OPTIONS="-s --connect-timeout 30 --retry 10 --verbose" TG_NOTIFY="${TG_NOTIFY:=Warning, Buildroot compiling error... ${{ matrix.platform }} (${{ matrix.release }})}" TG_HEADER=$(echo -e "\r\n$TG_NOTIFY \r\n\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9A\xA0 GitHub Actions") curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendMessage \ diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk index 5709fb72..489eb33e 100644 --- a/general/package/ipctool/ipctool.mk +++ b/general/package/ipctool/ipctool.mk @@ -4,15 +4,13 @@ # ################################################################################ -IPCTOOL_VERSION = HEAD +IPCTOOL_VERSION = $(shell git ls-remote https://github.com/OpenIPC/ipctool/ master | awk '{ print $$1 }') IPCTOOL_SITE = https://github.com/OpenIPC/ipctool.git IPCTOOL_SITE_METHOD = git IPCTOOL_LICENSE = MIT IPCTOOL_LICENSE_FILES = LICENSE -IPCTOOL_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS=--include .git - -IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release +IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_VERSION=ON IPCTOOL_MAKE_OPTS += VERBOSE=1