refactor: Adjust Helm push (#25)

Author: DiamondJoseph

.github/workflows/_container.yml

@@ -9,31 +9,44 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-            
 
-      
       - name: Generate Metadata
         id: meta
-        uses: docker/metadata-action@v5 
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
-      
-      # - name: Build image
-      #   uses: docker/build-push-actions@v6
-      
+          tags: |
+            type=raw,value=latest
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Build and export to Docker local cache
+        uses: docker/build-push-action@v6
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
+        with:
+          # Need load and tags so we can test it below
+          load: true
+          tags: test_tag
+
+      - name: Test cli works in cached runtime image
+        run: docker run --rm test_tag --version
+
       - name: Log in to GHCR
-        # if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io/${{ github.repository_owner }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Publish image
+      # This does not build the image again, it will find the image in the
+      # Docker cache and publish it
+      - name: Push cached image to container registry
         uses: docker/build-push-action@v6
         env:
           DOCKER_BUILD_RECORD_UPLOAD: false
         with:
-          # push: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          push: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/_helm.yml

@@ -14,31 +14,29 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - name: Install helm
-        uses: Azure/setup-helm@v3
+      - name: Generate Metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          tags: |
+            type=semver,pattern={{version}}
 
-      # Check that alpha/beta versions have the form X.Y.Z-alpha.A requried by Helm.
-      # An early check saves waiting for the entire build before finding a problem.
-      - name: Check helm version tag
-        if: ${{ github.ref_type == 'tag' }}
-        env:
-          VERSION: "${{ github.ref_name }}"
-        run: |
-          if [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+((-alpha|-beta|-rc)\.[0-9]+)?$ ]]; then
-              echo "Valid version format: '${VERSION}'"
-          else
-              echo "Invalid version: '${VERSION}'. Expected: 'X.Y.Z' or 'X.Y.Z-beta.1' or 'X.Y.Z-alpha.1'"
-              exit 1
-          fi
+      - name: Install helm
+        uses: Azure/setup-helm@v4
 
-    
-      - name: login to gcr using helm
+      - name: Login to chart registry
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | helm registry login ghcr.io --username ${{ github.repository_owner }} --password-stdin
 
-
-      - name: package chart and push it
+      - name: Package chart
         run: |
           helm dependencies update Charts/glazed
-          helm package Charts/glazed --version ${GITHUB_REF##*/} --app-version ${GITHUB_REF##*/} -d /tmp/
-          helm push /tmp/glazed-${GITHUB_REF##*/}.tgz oci://ghcr.io/diamondlightsource/charts
+          helm package Charts/glazed --version "${{ steps.meta.outputs.version }}" --app-version "${{ steps.meta.outputs.version }}" -d /tmp/
+
+      - name: Publish chart
+        env:
+          REPO: ${{ github.repository_owner }}
+        if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+        # Helm push requires the registry name is all lowercase
+        run: |
+          helm push /tmp/glazed-*.tgz oci://ghcr.io/${REPO@L}/charts