Changes following review

rancher · Apr 26, 2024 · 92674f7 · 92674f7
1 parent a93d652
commit 92674f7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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