ci: build images workflow updated to work differently for branches, and

tags

Author: nxtcoder17

.github/workflows/build-images.yml

@@ -51,19 +51,32 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & Push Image
+      - name: Create Image Tag from branch name
         if: startsWith(github.ref, 'refs/heads/release')
         run: |
           set +e
-
           IMAGE_TAG=$(echo ${GITHUB_REF#refs/heads/} | sed 's/release-//g')
-          OVERRIDE_PUSHED_IMAGE=false
-
           echo "$IMAGE_TAG" | grep -i '\-nightly$'
-          if [ $? -eq 0 ]; then
-            OVERRIDE_PUSHED_IMAGE=true
+          if [ $? -ne 0 ]; then
+            IMAGE_TAG="$IMAGE_TAG-nightly"
           fi
+          set -e
+
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+          echo "OVERRIDE_PUSHED_IMAGE=true" >> $GITHUB_ENV
 
+      - name: Create Image Tag from tag
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          IMAGE_TAG=$(echo ${GITHUB_REF#refs/tags/})
+
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+          echo "OVERRIDE_PUSHED_IMAGE=false" >> $GITHUB_ENV
+
+      - name: Build & Push Image
+        if: startsWith(github.ref, 'refs/heads/release') || startsWith(github.ref, 'refs/tags/')
+        run: |
+          set +e
           pushd ${{matrix.buildDir}}
 
           image=${{matrix.imageRepo}}:$IMAGE_TAG

.github/workflows/release-k3s-runner.yml

@@ -5,12 +5,8 @@ on:
 
   push:
     paths:
-      - cmd/**
-      - infrastructure-templates/**
-      - terraform/**
+      - cmd/k3s-runner
       - ".github/workflows/**"
-      - Dockerfile
-      - .ci/**
 
 permissions:
   contents: write
@@ -47,21 +43,28 @@ jobs:
           tar -xf upx.tar.xz
           sudo mv upx-4.2.1-amd64_linux/upx /usr/local/bin
 
-      - name: Create Release Tag
+
+      - name: Create Release Tag from branch name
         if: startsWith(github.ref, 'refs/heads/release')
         run: |
           set +e
           RELEASE_TAG=$(echo ${GITHUB_REF#refs/heads/} | sed 's/release-//g')
-          OVERRIDE_RELEASE=false
-
           echo "$RELEASE_TAG" | grep -i '\-nightly$'
-          if [ $? -eq 0 ]; then
-            OVERRIDE_RELEASE=true
+          if [ $? -ne 0 ]; then
+            RELEASE_TAG="$RELEASE_TAG-nightly"
           fi
           set -e
 
           echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_ENV
-          echo "OVERRIDE_RELEASE=$OVERRIDE_RELEASE" >> $GITHUB_ENV
+          echo "OVERRIDE_RELEASE=true" >> $GITHUB_ENV
+
+      - name: Create Release Tag from tag
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          RELEASE_TAG=$(echo ${GITHUB_REF#refs/tags/})
+
+          echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_ENV
+          echo "OVERRIDE_RELEASE=false" >> $GITHUB_ENV
 
       - name: Build And Release
         env: