Update workflows and scripts

Signed-off-by: Marcel Goerentz <m.goerentz@t-online.de>
marcelGoerentz · Dec 30, 2024 · a3d90ed · a3d90ed
1 parent 861e5af
commit a3d90ed
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -21,12 +21,11 @@ jobs:
       - name: Set build number
         id: set-build-number
         run: |
-          new_version=$(bash ${GITHUB_WORKSPACE}/Utility/set_buildnumber.sh ${{ vars.BUILD_NUMBER }})
-          echo "new_version=$new_version" >> $GITHUB_ENV
+          bash ${GITHUB_WORKSPACE}/Utility/set_buildnumber.sh ${{ vars.BUILD_NUMBER }}
 
       - name: Update repo variable
         run: |
-          bash ${GITHUB_WORKSPACE}/Utility/update_buildnumber_variable.sh ${{ secrets.API_TOKEN }} ${{ github.repository }} ${{ env.NEW_BUILD }}
+          bash ${GITHUB_WORKSPACE}/Utility/update_buildnumber_variable.sh ${{ secrets.API_TOKEN }} ${{ github.repository }} ${{ env.new_version }}
 
       - name: Set up and Build
         uses: actions/setup-go@v5
@@ -44,8 +43,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           prerelease: true
-          name: v${{ steps.set-build-number.outputs.new_version }} (Beta)
-          tag_name: v${{ steps.set-build-number.outputs.new_version }}-beta
+          name: v${{ env.new_version }} (Beta)
+          tag_name: v${{ env.new_version }}-beta
           files: dist/*
 
   buildDockerImages:
@@ -58,6 +57,7 @@ jobs:
 
       - name: Set NEW_VERSION
         run: echo "NEW_VERSION=${{ needs.buildBinaries.outputs.new_version }}" >> $GITHUB_ENV
+        shell: bash
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -79,4 +79,5 @@ jobs:
           no-cache: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
           tags: |
-            mgoerentz/threadfin:${{ env.NEW_VERSION }}-beta
+            mgoerentz/threadfin:latest-beta
+            mgoerentz/threadfin:v${{ env.NEW_VERSION }}-beta
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,28 +1,31 @@
 name: Threadfin Build
 on:
   push:
-    tags: 
-      - 'v*'
+    branches: 
+      - master
 
 permissions:
   contents: write
 jobs:
   buildBinaries:
     name: Build and release binaries
     runs-on: ubuntu-latest
+    outputs:
+      new_version: ${{ steps.set-build-number.outputs.new_version }}
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
         with:
           ref: main
 
       - name: Set build number
+        id: set-build-number
         run: |
-          bash ${GITHUB_WORKSPACE}/Utility/set_buildnumber.sh ${{ vars.BUILD_NUMBER }}
+          bash ${GITHUB_WORKSPACE}/Utility/set_build_number.sh ${{ vars.BUILD_NUMBER }}
 
       - name: Update repo variable
         run: |
-          bash ${GITHUB_WORKSPACE}/Utility/update_buildnumber_variable.sh ${{ secrets.API_TOKEN }} ${{ github.repository }} ${{ env.NEW_BUILD }}
+          bash ${GITHUB_WORKSPACE}/Utility/update_build_number_variable.sh ${{ secrets.API_TOKEN }} ${{ github.repository }} ${{ env.NEW_BUILD }}
 
       - name: Set up and Build
         uses: actions/setup-go@v5
@@ -45,10 +48,15 @@ jobs:
   buildDockerImages:
     name: Build and push Docker Images
     runs-on: ubuntu-latest
+    needs: buildBinaries
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set NEW_VERSION
+        run: echo "NEW_VERSION=${{ needs.buildBinaries.outputs.new_version }}" >> $GITHUB_ENV
+        shell: bash
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -69,4 +77,4 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
           tags: |
             mgoerentz/threadfin:latest
-            mgoerentz/threadfin:${{  github.ref_name }}
+            mgoerentz/threadfin:v${{ env.NEW_VERSION }}
diff --git a/Utility/set_buildnumber.sh → Utility/set_build_number.sh b/Utility/set_buildnumber.sh → Utility/set_build_number.sh
@@ -7,8 +7,6 @@ fi
 
 new_build=$(($1 + 1))
 
-echo "New buildnumber is: $new_build"
-
 # Extract the version number
 version=$(grep 'const Version' "threadfin.go" | sed 's/.*Version = "\(.*\)"/\1/')
 
@@ -21,8 +19,6 @@ minor=${version_parts[1]}
 patch=${version_parts[2]}
 new_version="$major.$minor.$patch.$new_build"
 
-echo "New version is: $new_version"
-
 # Update the version in the file
 sed -i "s/const Version = \".*\"/const Version = \"$new_version\"/" threadfin.go
 
@@ -31,3 +27,6 @@ echo "NEW_BUILD=$new_build" >> $GITHUB_ENV
 
 # Export the new Version to the GitHub environment
 echo "NEW_VERSION=$new_version" >> $GITHUB_ENV
+
+# Set the output for the GitHub Actions step
+echo "new_version=$new_version" >> $GITHUB_OUTPUT
diff --git a/Utility/update_buildnumber_variable.sh → Utility/update_build_number_variable.sh b/Utility/update_buildnumber_variable.sh → Utility/update_build_number_variable.sh