From fb1c4c13d31c7ada4833366ebd5811e8b3d6d17d Mon Sep 17 00:00:00 2001
From: Peter Van Bouwel <peter.vanbouwel@vito.be>
Date: Tue, 19 Nov 2024 10:47:49 +0100
Subject: [PATCH] cicd: always publish container

---
 .github/workflows/container_build.yml | 46 ---------------------------
 .github/workflows/go.yml              | 41 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/container_build.yml

diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
deleted file mode 100644
index e814d45..0000000
--- a/.github/workflows/container_build.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Push new version
-
-# This workflow runs when any of the following occur:
-# - A push is made to a branch called `main` or `seed`
-# - A tag starting with "v" is created
-# - A pull request is created or updated
-on:
-  push:
-    tags:
-      - v*
-env:
-  IMAGE_NAME: fakes3pp
-
-jobs:
-  # This pushes the image to GitHub Packages.
-  push:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
-
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-        #
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # This changes all uppercase characters to lowercase.
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          # This strips the git ref prefix from the version.
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # This strips the "v" prefix from the tag name.
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # This uses the Docker `latest` tag convention.
-          [ "$VERSION" == "main" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 25f5da6..5f59a4f 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -9,6 +9,9 @@ on:
   pull_request:
     branches: [ "*", "**" ]
 
+env:
+  IMAGE_NAME: fakes3pp
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -64,3 +67,41 @@ jobs:
     - name: Test
       # As we use config files from time to time we always want to run without cache
       run: go clean -testcache && go test -coverprofile cover.out -v ./...
+
+    - name: Vet
+      run: go vet
+  # This pushes the image to GitHub Packages.
+  push:
+    runs-on: ubuntu-latest
+    needs: [build]
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build image
+        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+        #
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+
+          # This changes all uppercase characters to lowercase.
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+          # This strips the git ref prefix from the version.
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # This strips the "v" prefix from the tag name.
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          # This uses the Docker `latest` tag convention.
+          [ "$VERSION" == "main" ] && VERSION=latest
+          # Use commit hash if no other applicable tag
+          [ "$VERSION" != "latest" ] && [[ "${{ github.ref }}" != "refs/tags/"* ]] && VERSION="commit-$GITHUB_SHA"
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION