From 158b35db06c45b0880c48d1ec2bca87916cf9093 Mon Sep 17 00:00:00 2001
From: Lionel ORRY <lionel.orry@gmail.com>
Date: Wed, 30 Jul 2025 14:35:01 +0200
Subject: [PATCH] simplify workflows

---
 .github/workflows/build-and-push.yml  | 16 +++++-----------
 .github/workflows/trigger-nightly.yml |  5 +----
 Dockerfile                            |  9 +++++----
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 3aa5bef6..4c520e4e 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -42,22 +42,16 @@ jobs:
             username: ${{ github.actor }}
             password: ${{ secrets.GITHUB_TOKEN }}
 
-        - name: Build and push
+        - name: Build and push image
           env:
-            REGISTRY_INPUT: ${{ inputs.push_to_project }}
+            IMAGE_REGISTRY: ${{ inputs.push_to_project }}
             GH_REF: ${{ inputs.ref }}
           working-directory: src/github.com/cloudbase/garm
           run: |
             if [ "$GH_REF" == "main" ]; then
-              VERSION="nightly"
+              IMAGE_TAG="nightly"
             else
-              VERSION=$(git describe --tags --match='v[0-9]*' --always)
-            fi
-            if [ "$GH_REF" == "release/v0.1" ]; then
-              VERSION="v0.1"
-            fi
-            if [ "$GH_REF" == "release/v0.2" ]; then
-              VERSION="v0.2"
+              IMAGE_TAG=$(git describe --tags --match='v[0-9]*' --always)
             fi
             docker buildx build \
               --provenance=false \
@@ -66,5 +60,5 @@ jobs:
               --label "org.opencontainers.image.description=GARM ${GH_REF}" \
               --label "org.opencontainers.image.licenses=Apache 2.0" \
               --build-arg="GARM_REF=${GH_REF}" \
-              -t ${REGISTRY_INPUT}/garm:"${VERSION}" \
+              -t ${IMAGE_REGISTRY}/garm:"${IMAGE_TAG}" \
               --push .
diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml
index b643129a..e0b83856 100644
--- a/.github/workflows/trigger-nightly.yml
+++ b/.github/workflows/trigger-nightly.yml
@@ -6,8 +6,5 @@ on:
 jobs:
   call-build-and-push:
     uses: ./.github/workflows/build-and-push.yml
-    strategy:
-      matrix:
-        ref: ["main", "release/v0.1", "release/v0.2"]
     with:
-      ref: ${{ matrix.ref }}
+      ref: "main"
diff --git a/Dockerfile b/Dockerfile
index e0c67206..045581f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,11 +35,11 @@ RUN set -e; \
         export PROVIDER_NAME="$(basename $repo)"; \
         export PROVIDER_SUBDIR=""; \
         if [ "$GARM_REF" == "main" ]; then \
-          export PROVIDER_TAG="main"; \
+          export PROVIDER_REF="main"; \
         else \
-          export PROVIDER_TAG="$(curl -s -L https://api.github.com/repos/$repo/releases/latest | jq -r '.tag_name')"; \
+          export PROVIDER_REF="$(curl -s -L https://api.github.com/repos/$repo/releases/latest | jq -r '.tag_name')"; \
         fi; \
-        git clone --branch "$PROVIDER_TAG" "https://github.com/$repo" "/build/$PROVIDER_NAME"; \
+        git clone --branch "$PROVIDER_REF" "https://github.com/$repo" "/build/$PROVIDER_NAME"; \
         case $PROVIDER_NAME in \
         "garm-provider-k8s") \
             export PROVIDER_SUBDIR="cmd/garm-provider-k8s"; \
@@ -49,7 +49,8 @@ RUN set -e; \
             export PROVIDER_LDFLAGS="-linkmode external -extldflags \"-static\" -s -w"; \
             ;; \
         *) \
-            export PROVIDER_LDFLAGS="-linkmode external -extldflags \"-static\" -s -w -X main.Version=$(git -C /build/$PROVIDER_NAME describe --tags --match='v[0-9]*' --dirty --always)"; \
+            export PROVIDER_VERSION=$(git -C /build/$PROVIDER_NAME describe --tags --match='v[0-9]*' --dirty --always); \
+            export PROVIDER_LDFLAGS="-linkmode external -extldflags \"-static\" -s -w -X main.Version=$PROVIDER_VERSION"; \
             ;; \
         esac; \
         cd "/build/$PROVIDER_NAME/$PROVIDER_SUBDIR" \