From 0f15cc6502f7f4a962f20038bcaca1f1092b532b Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Tue, 26 Mar 2024 08:12:45 +0100
Subject: [PATCH] [no ci] Workflow: update settings
---
.github/workflows/build.yml | 15 +++++----------
.github/workflows/toolchain.yml | 3 ---
general/external.mk | 1 +
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1466cdb..49cf9a3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
branches:
- master
schedule:
- - cron: '0 1 * * *'
+ - cron: '0 1 * * *'
workflow_dispatch:
env:
@@ -168,9 +168,10 @@ jobs:
- name: Checkout source
uses: actions/checkout@v4
- - name: Prepare ccache
+ - name: Prepare firmware
run: |
echo CACHE_DATE=$(date +%m) >> ${GITHUB_ENV}
+ make BOARD=${{matrix.platform}}_${{matrix.release}} br-source
- name: Setup ccache
if: github.event_name != 'pull_request'
@@ -186,12 +187,6 @@ jobs:
path: /tmp/ccache
key: ${{matrix.platform}}_${{matrix.release}}-${{env.CACHE_DATE}}
- - name: Download files
- run: |
- echo "8.8.8.8 invisible-mirror.net" | sudo tee -a /etc/hosts
- echo "8.8.8.8 distfiles.dereferenced.org" | sudo tee -a /etc/hosts
- make BOARD=${{matrix.platform}}_${{matrix.release}} br-source
-
- name: Build firmware
run: |
export GIT_HASH=$(git rev-parse --short ${GITHUB_SHA})
@@ -231,7 +226,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} -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot${TG_TOKEN}/sendDocument -F chat_id=${TG_CHANNEL} -F caption="${TG_HEADER}" -F document=@${NORFW})
+ 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
@@ -241,5 +236,5 @@ jobs:
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} -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot${TG_TOKEN}/sendMessage -F chat_id=${TG_CHANNEL} -F text="${TG_HEADER}")
+ HTTP=$(curl ${TG_OPTIONS} https://api.telegram.org/bot${TG_TOKEN}/sendMessage -F chat_id=${TG_CHANNEL} -F text="${TG_HEADER}")
echo Telegram response: ${HTTP}
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
index 465f3266..773bb0f6 100644
--- a/.github/workflows/toolchain.yml
+++ b/.github/workflows/toolchain.yml
@@ -76,9 +76,6 @@ jobs:
- name: Build toolchain
run: |
- echo "8.8.8.8 invisible-mirror.net" | sudo tee -a /etc/hosts
- echo "8.8.8.8 distfiles.dereferenced.org" | sudo tee -a /etc/hosts
-
CONFIG=$(find br-ext-chip-* -name ${{matrix.platform}}_lite_defconfig)
GCC=$(make BOARD=${CONFIG} toolname).tgz
URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${GCC}
diff --git a/general/external.mk b/general/external.mk
index 1394fe36..8263a12d 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -8,5 +8,6 @@ export OPENIPC_MAJESTIC := $(call qstrip,$(BR2_OPENIPC_MAJESTIC))
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)
+BR2_WGET := "wget --show-progress --passive-ftp -nd -T1"
include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))