From 92674f7562ebeaf768f3bddbad60d310f7918d22 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 26 Apr 2024 12:00:43 +0100
Subject: [PATCH] Changes following review

---
 .github/workflows/build-branch.yaml  | 5 +++++
 .github/workflows/build-release.yaml | 2 +-
 .github/workflows/test.yaml          | 1 +
 scripts/build-static                 | 7 ++++---
 scripts/gcs_upload_asset             | 9 ---------
 5 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100755 scripts/gcs_upload_asset

diff --git a/.github/workflows/build-branch.yaml b/.github/workflows/build-branch.yaml
index c323c56d2c..def743214f 100644
--- a/.github/workflows/build-branch.yaml
+++ b/.github/workflows/build-branch.yaml
@@ -3,6 +3,11 @@ on:
   push:
     branches:
       - master
+      - 'release-*'
+      - '*-dev'
+      # TODO RC remove
+      - richard-drone-ui-pr
+
 jobs:
   test:
     uses: ./.github/workflows/test.yaml
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
index 199a4c0073..17f32f47d7 100644
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@@ -2,7 +2,7 @@ name: Build (Release)
 on:
   push:
     tags:
-      - v2.9.*
+      - v*
 
 jobs:
   test:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1e6bb6b0d0..074ab82189 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - 'release-*'
+  # This tells GH that the workflow is reusable
   workflow_call:
 
 jobs:
diff --git a/scripts/build-static b/scripts/build-static
index 485d085439..b62cb83f7e 100755
--- a/scripts/build-static
+++ b/scripts/build-static
@@ -115,9 +115,10 @@ BUILD_DIR="${BUILD_PAR}/${VERSION}"
 BUILD_TGZ="${BUILD_PAR}/${VERSION}.tar.gz"
 
 # Outputs for gh actions
-echo "BUILD_DIR=${BUILD_DIR}" >> "$GITHUB_OUTPUT"
-echo "BUILD_TGZ=${BUILD_TGZ}" >> "$GITHUB_OUTPUT"
-echo "VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
+ENV_OUTPUT="${GITHUB_OUTPUT:-"temp-env"}"
+echo "BUILD_DIR=${BUILD_DIR}" >> "$ENV_OUTPUT"
+echo "BUILD_TGZ=${BUILD_TGZ}" >> "$ENV_OUTPUT"
+echo "VERSION=${VERSION}" >> "$ENV_OUTPUT"
 
 # Print settings
 echo "Branch: ${BRANCH}"
diff --git a/scripts/gcs_upload_asset b/scripts/gcs_upload_asset
deleted file mode 100755
index 2f2b3a1d88..0000000000
--- a/scripts/gcs_upload_asset
+++ /dev/null
@@ -1,9 +0,0 @@
-# #!/bin/bash -x
-
-# set -eu
-
-# source "$(dirname $0)/utils.sh"
-
-# gcs_upload_asset $@
-
-exit 1