From 24b5cf705f0ea909e3c6385fa43c5fa40802be8d Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:36:22 +0100 Subject: [PATCH] [no ci] Workflow: remove telegram error notification --- .github/workflows/build.yml | 17 +++-------------- general/external.mk | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49cf9a3b..9cabbb3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,9 +12,6 @@ on: env: TAG_NAME: latest - TG_TOKEN: ${{secrets.TELEGRAM_TOKEN_BOT_OPENIPC}} - TG_CHANNEL: ${{secrets.TELEGRAM_CHANNEL_OPENIPC_DEV}} - TG_OPTIONS: -s -o /dev/null -w %{http_code} jobs: buildroot: @@ -226,15 +223,7 @@ jobs: TG_MSG="Commit: ${GIT_HASH}\nBranch: ${GIT_BRANCH}\nTag: ${TAG_NAME}\nTime: ${TIME}\n\n" TG_ICON="\xE2\x9C\x85 GitHub Actions" TG_HEADER=$(echo -e ${TG_MSG}${TG_ICON}) - HTTP=$(curl ${TG_OPTIONS} https://api.telegram.org/bot${TG_TOKEN}/sendDocument -F chat_id=${TG_CHANNEL} -F caption="${TG_HEADER}" -F document=@${NORFW}) - echo Telegram response: ${HTTP} - - - name: Send error - if: github.event_name != 'pull_request' && failure() - run: | - TG_WARN="Error: ${{matrix.platform}}_${{matrix.release}}\n" - TG_MSG="Commit: ${GIT_HASH}\nBranch: ${GIT_BRANCH}\nTag: ${TAG_NAME}\n\n" - TG_ICON="\xE2\x9A\xA0 GitHub Actions" - TG_HEADER=$(echo -e ${TG_WARN}${TG_MSG}${TG_ICON}) - HTTP=$(curl ${TG_OPTIONS} https://api.telegram.org/bot${TG_TOKEN}/sendMessage -F chat_id=${TG_CHANNEL} -F text="${TG_HEADER}") + TG_TOKEN=${{secrets.TELEGRAM_TOKEN_BOT_OPENIPC}} + TG_CHANNEL=${{secrets.TELEGRAM_CHANNEL_OPENIPC_DEV}} + HTTP=$(curl -s -o /dev/null -w %{http_code} https://api.telegram.org/bot${TG_TOKEN}/sendDocument -F chat_id=${TG_CHANNEL} -F caption="${TG_HEADER}" -F document=@${NORFW}) echo Telegram response: ${HTTP} diff --git a/general/external.mk b/general/external.mk index 07afd5d9..5cb2e18b 100644 --- a/general/external.mk +++ b/general/external.mk @@ -9,6 +9,6 @@ EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR) OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG)) OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY) -export WGET := wget -q --show-progress --passive-ftp -nd -T2 -t2 +export WGET := wget -q --show-progress --passive-ftp -nd -t3 -T3 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))