From 803fe63497d0616379e116e42f4516a51bd84ada Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Tue, 6 Jun 2023 05:04:21 +0200
Subject: [PATCH] [no ci] Workflow: consolidate build steps

---
 .github/workflows/build.yml     |  4 +---
 .github/workflows/toolchain.yml | 20 +++++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e126084..50927758 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,9 +7,7 @@ on:
       - opened
   push:
     branches:
-      - 'master'
-    tags:
-      - 'v*'
+      - master
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
index e39fc310..7a5c96da 100644
--- a/.github/workflows/toolchain.yml
+++ b/.github/workflows/toolchain.yml
@@ -46,28 +46,22 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Determine toolchain
+      - name: Build toolchain
         run: |
           echo "8.8.8.8 invisible-mirror.net" | sudo tee -a /etc/hosts
-          GCC=$(make BOARD=${{matrix.platform}}_lite toolname)
+          CONFIG=$(find br-ext-chip-* -name ${{matrix.platform}}_lite_defconfig)
+          GCC=$(make BOARD=${CONFIG} toolname)
           echo GCC=${GCC} >> ${GITHUB_ENV}
           URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${GCC}.tgz
           echo ${URL}
           if ! wget --spider ${URL} 2> /dev/null; then
-            echo BUILD=true >> ${GITHUB_ENV}
+            sed -i "s|EXTERNAL=y|EXTERNAL=n|g" ${CONFIG}
+            make BOARD=${CONFIG} br-sdk
+            SDK=$(find output/images -name *_sdk-buildroot.tar.gz)
+            mv ${SDK} ${GCC}.tgz
           fi
 
-      - name: Build toolchain
-        if: env.BUILD
-        run: |
-          CONFIG=$(find br-ext-chip-* -name ${{matrix.platform}}_lite_defconfig)
-          sed -i "s|EXTERNAL=y|EXTERNAL=n|g" ${CONFIG}
-          make BOARD=${CONFIG} br-sdk
-          SDK=$(find output/images -name *_sdk-buildroot.tar.gz)
-          mv ${SDK} ${GCC}.tgz
-
       - name: Upload toolchain
-        if: env.BUILD
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{env.TAG_NAME}}