refactoring install/update

mblaschke · mblaschke · commit 9fc4c29fff58 · 2025-12-03T23:56:34.000+01:00
- add support for hostedtoolcache (env var RUNNER_TOOL_CACHE)
- fix update by forcing installation
- improve asset generation

Signed-off-by: Markus Blaschke &lt;mblaschke82@gmail.com&gt;
diff --git a/.github/workflows/release-assets.yaml b/.github/workflows/release-assets.yaml
@@ -16,9 +16,16 @@ permissions:
   packages: write
 
 jobs:
-  executables:
-    name: "assets/executables"
+  build:
+    name: "${{ matrix.task }}"
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - task: release-assets-linux
+          - task: release-assets-darwin
+          - task: release-assets-windows
     steps:
       - uses: actions/checkout@v5
 
@@ -28,17 +35,9 @@ jobs:
       - name: Setup go
         uses: ./.github/actions/setup-go
 
-      - name: Build linux
+      - name: Build
         run: |
-          make release-assets-linux
-
-      - name: Build darwin
-        run: |
-          make release-assets-darwin
-
-      - name: Build windows
-        run: |
-          make release-assets-windows
+          make "${{ matrix.task }}"
 
       - name: Upload assets to release
         uses: svenstaro/upload-release-action@v2
@@ -48,10 +47,12 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true
+          promote: false
 
   plugins:
     name: "assets/plugins"
     runs-on: ubuntu-latest
+    needs: [build]
     steps:
       - uses: actions/checkout@v5
 
@@ -108,3 +109,5 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true
+          promote: true
+          make_latest: true
diff --git a/install.sh b/install.sh
@@ -2,6 +2,16 @@
 set -e
 set -o pipefail
 
+if [[ -z "$HELM_PLUGIN_DIR" ]]; then
+    echo "ERROR: env var HELM_PLUGIN_DIR not set (script must be called by helm)"
+    exit 1
+fi
+
+FORCE=0
+if [[ "$1" == "force" ]]; then
+    FORCE=1
+fi
+
 HELM_AZURE_TPL_VERSION=$(sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' "${HELM_PLUGIN_DIR}/plugin.yaml")
 
 HOST_OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -35,16 +45,50 @@ PLUGIN_DOWNLOAD_FILE="helm-azure-tpl.${HOST_OS}.${HOST_ARCH}${FILE_SUFFIX}"
 PLUGIN_DOWNLOAD_URL="https://github.com/webdevops/helm-azure-tpl/releases/download/${HELM_AZURE_TPL_VERSION}/${PLUGIN_DOWNLOAD_FILE}"
 PLUGIN_TARGET_PATH="${HELM_PLUGIN_DIR}/helm-azure-tpl${FILE_SUFFIX}"
 
-echo "starting download (via curl)"
+echo "installing helm-azure-tpl executable"
 echo "  platform: ${HOST_OS}/${HOST_ARCH}"
 echo "       url: $PLUGIN_DOWNLOAD_URL"
 echo "    target: $PLUGIN_TARGET_PATH"
 
-rm -f -- "$PLUGIN_TARGET_PATH"
-curl --fail --location "$PLUGIN_DOWNLOAD_URL" -o "$PLUGIN_TARGET_PATH"
-if [ "$?" -ne 0 ]; then
-    >&2 echo "[ERROR] failed to download plugin executable"
-    exit 1
+## detect hostedtoolcache
+PLUGIN_CACHE_DIR=""
+PLUGIN_CACHE_FILE=""
+if [[ -n "$RUNNER_TOOL_CACHE" ]]; then
+	PLUGIN_CACHE_DIR="${RUNNER_TOOL_CACHE}/helm-azure-tpl/${HELM_AZURE_TPL_VERSION}"
+	PLUGIN_CACHE_FILE="${PLUGIN_CACHE_DIR}/${PLUGIN_DOWNLOAD_FILE}"
+	echo "    cache: $PLUGIN_CACHE_FILE"
+fi
+
+## force (cleanup/upgrade)
+if [[ "$FORCE" -eq 1 && -f "$PLUGIN_TARGET_PATH" ]]; then
+    echo "removing old executable (update/force mode)"
+    rm -f -- "$PLUGIN_TARGET_PATH"
+fi
+
+## get from hostedtoolcache
+if [[ -n "$PLUGIN_CACHE_FILE" && -e "$PLUGIN_CACHE_FILE" ]]; then
+	echo "fetching from RUNNER_TOOL_CACHE ($RUNNER_TOOL_CACHE)"
+	cp -- "$PLUGIN_CACHE_FILE" "$PLUGIN_TARGET_PATH"
+	chmod +x "$PLUGIN_TARGET_PATH"
+fi
+
+## download
+if [[ ! -e "$PLUGIN_TARGET_PATH" ]]; then
+    echo "starting download (using curl)"
+	curl --fail --location "$PLUGIN_DOWNLOAD_URL" -o "$PLUGIN_TARGET_PATH"
+	if [ "$?" -ne 0 ]; then
+	    >&2 echo "[ERROR] failed to download plugin executable"
+	    exit 1
+	fi
+
+	## store to hostedtoolcache
+	if [[ -n "$PLUGIN_CACHE_FILE" ]]; then
+		echo "storing to RUNNER_TOOL_CACHE ($RUNNER_TOOL_CACHE)"
+		mkdir -p -- "${PLUGIN_CACHE_DIR}"
+		cp -a -- "$PLUGIN_TARGET_PATH" "${PLUGIN_CACHE_FILE}"
+	fi
+else
+    echo "executable already exists, skipping download"
 fi
 
 if [[ ! -f "$PLUGIN_TARGET_PATH" ]]; then
@@ -54,4 +98,4 @@ fi
 
 chmod +x "$PLUGIN_TARGET_PATH"
 
-echo "successfully downloaded executable"
+echo "successfully installed executable"
diff --git a/plugin.yaml b/plugin.yaml
@@ -32,7 +32,7 @@ platformCommand:
     command: "$HELM_PLUGIN_DIR/helm-azure-tpl.exe"
 hooks:
   install: "bash $HELM_PLUGIN_DIR/install.sh"
-  update: "bash $HELM_PLUGIN_DIR/install.sh"
+  update: "bash $HELM_PLUGIN_DIR/install.sh force"
 downloaders:
   - command: "plugin.sh"
     protocols:
diff --git a/plugins/azure-tpl-cli/install.sh b/plugins/azure-tpl-cli/install.sh
@@ -2,6 +2,16 @@
 set -e
 set -o pipefail
 
+if [[ -z "$HELM_PLUGIN_DIR" ]]; then
+    echo "ERROR: env var HELM_PLUGIN_DIR not set (script must be called by helm)"
+    exit 1
+fi
+
+FORCE=0
+if [[ "$1" == "force" ]]; then
+    FORCE=1
+fi
+
 HELM_AZURE_TPL_VERSION=$(sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' "${HELM_PLUGIN_DIR}/plugin.yaml")
 
 HOST_OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -35,16 +45,50 @@ PLUGIN_DOWNLOAD_FILE="helm-azure-tpl.${HOST_OS}.${HOST_ARCH}${FILE_SUFFIX}"
 PLUGIN_DOWNLOAD_URL="https://github.com/webdevops/helm-azure-tpl/releases/download/${HELM_AZURE_TPL_VERSION}/${PLUGIN_DOWNLOAD_FILE}"
 PLUGIN_TARGET_PATH="${HELM_PLUGIN_DIR}/helm-azure-tpl${FILE_SUFFIX}"
 
-echo "starting download (via curl)"
+echo "installing helm-azure-tpl executable"
 echo "  platform: ${HOST_OS}/${HOST_ARCH}"
 echo "       url: $PLUGIN_DOWNLOAD_URL"
 echo "    target: $PLUGIN_TARGET_PATH"
 
-rm -f -- "$PLUGIN_TARGET_PATH"
-curl --fail --location "$PLUGIN_DOWNLOAD_URL" -o "$PLUGIN_TARGET_PATH"
-if [ "$?" -ne 0 ]; then
-    >&2 echo "[ERROR] failed to download plugin executable"
-    exit 1
+## detect hostedtoolcache
+PLUGIN_CACHE_DIR=""
+PLUGIN_CACHE_FILE=""
+if [[ -n "$RUNNER_TOOL_CACHE" ]]; then
+	PLUGIN_CACHE_DIR="${RUNNER_TOOL_CACHE}/helm-azure-tpl/${HELM_AZURE_TPL_VERSION}"
+	PLUGIN_CACHE_FILE="${PLUGIN_CACHE_DIR}/${PLUGIN_DOWNLOAD_FILE}"
+	echo "    cache: $PLUGIN_CACHE_FILE"
+fi
+
+## force (cleanup/upgrade)
+if [[ "$FORCE" -eq 1 && -f "$PLUGIN_TARGET_PATH" ]]; then
+    echo "removing old executable (update/force mode)"
+    rm -f -- "$PLUGIN_TARGET_PATH"
+fi
+
+## get from hostedtoolcache
+if [[ -n "$PLUGIN_CACHE_FILE" && -e "$PLUGIN_CACHE_FILE" ]]; then
+	echo "fetching from RUNNER_TOOL_CACHE ($RUNNER_TOOL_CACHE)"
+	cp -- "$PLUGIN_CACHE_FILE" "$PLUGIN_TARGET_PATH"
+	chmod +x "$PLUGIN_TARGET_PATH"
+fi
+
+## download
+if [[ ! -e "$PLUGIN_TARGET_PATH" ]]; then
+    echo "starting download (using curl)"
+	curl --fail --location "$PLUGIN_DOWNLOAD_URL" -o "$PLUGIN_TARGET_PATH"
+	if [ "$?" -ne 0 ]; then
+	    >&2 echo "[ERROR] failed to download plugin executable"
+	    exit 1
+	fi
+
+	## store to hostedtoolcache
+	if [[ -n "$PLUGIN_CACHE_FILE" ]]; then
+		echo "storing to RUNNER_TOOL_CACHE ($RUNNER_TOOL_CACHE)"
+		mkdir -p -- "${PLUGIN_CACHE_DIR}"
+		cp -a -- "$PLUGIN_TARGET_PATH" "${PLUGIN_CACHE_FILE}"
+	fi
+else
+    echo "executable already exists, skipping download"
 fi
 
 if [[ ! -f "$PLUGIN_TARGET_PATH" ]]; then
@@ -54,4 +98,4 @@ fi
 
 chmod +x "$PLUGIN_TARGET_PATH"
 
-echo "successfully downloaded executable"
+echo "successfully installed executable"
diff --git a/plugins/azure-tpl-cli/plugin.yaml b/plugins/azure-tpl-cli/plugin.yaml
@@ -25,6 +25,6 @@ runtimeConfig:
         command: "$HELM_PLUGIN_DIR/install.sh"
     update:
       - os: linux
-        command: "$HELM_PLUGIN_DIR/install.sh"
+        command: "$HELM_PLUGIN_DIR/install.sh force"
       - os: darwin
-        command: "$HELM_PLUGIN_DIR/install.sh"
+        command: "$HELM_PLUGIN_DIR/install.sh force"
diff --git a/plugins/azure-tpl-getter/install.sh b/plugins/azure-tpl-getter/install.sh
@@ -2,6 +2,16 @@
 set -e
 set -o pipefail
 
+if [[ -z "$HELM_PLUGIN_DIR" ]]; then
+    echo "ERROR: env var HELM_PLUGIN_DIR not set (script must be called by helm)"
+    exit 1
+fi
+
+FORCE=0
+if [[ "$1" == "force" ]]; then
+    FORCE=1
+fi
+
 HELM_AZURE_TPL_VERSION=$(sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' "${HELM_PLUGIN_DIR}/plugin.yaml")
 
 HOST_OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -35,16 +45,50 @@ PLUGIN_DOWNLOAD_FILE="helm-azure-tpl.${HOST_OS}.${HOST_ARCH}${FILE_SUFFIX}"
 PLUGIN_DOWNLOAD_URL="https://github.com/webdevops/helm-azure-tpl/releases/download/${HELM_AZURE_TPL_VERSION}/${PLUGIN_DOWNLOAD_FILE}"
 PLUGIN_TARGET_PATH="${HELM_PLUGIN_DIR}/helm-azure-tpl${FILE_SUFFIX}"
 
-echo "starting download (via curl)"
+echo "installing helm-azure-tpl executable"
 echo "  platform: ${HOST_OS}/${HOST_ARCH}"
 echo "       url: $PLUGIN_DOWNLOAD_URL"
 echo "    target: $PLUGIN_TARGET_PATH"
 
-rm -f -- "$PLUGIN_TARGET_PATH"
-curl --fail --location "$PLUGIN_DOWNLOAD_URL" -o "$PLUGIN_TARGET_PATH"
-if [ "$?" -ne 0 ]; then
-    >&2 echo "[ERROR] failed to download plugin executable"
-    exit 1
+## detect hostedtoolcache
+PLUGIN_CACHE_DIR=""
+PLUGIN_CACHE_FILE=""
+if [[ -n "$RUNNER_TOOL_CACHE" ]]; then
+	PLUGIN_CACHE_DIR="${RUNNER_TOOL_CACHE}/helm-azure-tpl/${HELM_AZURE_TPL_VERSION}"
+	PLUGIN_CACHE_FILE="${PLUGIN_CACHE_DIR}/${PLUGIN_DOWNLOAD_FILE}"
+	echo "    cache: $PLUGIN_CACHE_FILE"
+fi
+
+## force (cleanup/upgrade)
+if [[ "$FORCE" -eq 1 && -f "$PLUGIN_TARGET_PATH" ]]; then
+    echo "removing old executable (update/force mode)"
+    rm -f -- "$PLUGIN_TARGET_PATH"
+fi
+
+## get from hostedtoolcache
+if [[ -n "$PLUGIN_CACHE_FILE" && -e "$PLUGIN_CACHE_FILE" ]]; then
+	echo "fetching from RUNNER_TOOL_CACHE ($RUNNER_TOOL_CACHE)"
+	cp -- "$PLUGIN_CACHE_FILE" "$PLUGIN_TARGET_PATH"
+	chmod +x "$PLUGIN_TARGET_PATH"
+fi
+
+## download
+if [[ ! -e "$PLUGIN_TARGET_PATH" ]]; then
+    echo "starting download (using curl)"
+	curl --fail --location "$PLUGIN_DOWNLOAD_URL" -o "$PLUGIN_TARGET_PATH"
+	if [ "$?" -ne 0 ]; then
+	    >&2 echo "[ERROR] failed to download plugin executable"
+	    exit 1
+	fi
+
+	## store to hostedtoolcache
+	if [[ -n "$PLUGIN_CACHE_FILE" ]]; then
+		echo "storing to RUNNER_TOOL_CACHE ($RUNNER_TOOL_CACHE)"
+		mkdir -p -- "${PLUGIN_CACHE_DIR}"
+		cp -a -- "$PLUGIN_TARGET_PATH" "${PLUGIN_CACHE_FILE}"
+	fi
+else
+    echo "executable already exists, skipping download"
 fi
 
 if [[ ! -f "$PLUGIN_TARGET_PATH" ]]; then
@@ -54,4 +98,4 @@ fi
 
 chmod +x "$PLUGIN_TARGET_PATH"
 
-echo "successfully downloaded executable"
+echo "successfully installed executable"
diff --git a/plugins/azure-tpl-getter/plugin.yaml b/plugins/azure-tpl-getter/plugin.yaml
@@ -31,7 +31,7 @@ runtimeConfig:
       - command: "$HELM_PLUGIN_DIR/install.sh"
     update:
       - os: linux
-        command: "$HELM_PLUGIN_DIR/install.sh"
+        command: "$HELM_PLUGIN_DIR/install.sh force"
       - os: darwin
-        command: "$HELM_PLUGIN_DIR/install.sh"
-      - command: "$HELM_PLUGIN_DIR/install.sh"
+        command: "$HELM_PLUGIN_DIR/install.sh force"
+      - command: "$HELM_PLUGIN_DIR/install.sh force"
diff --git a/plugins/azure-tpl/install.sh b/plugins/azure-tpl/install.sh
diff --git a/plugins/azure-tpl/plugin.yaml b/plugins/azure-tpl/plugin.yaml
