Merge pull request #146 from github-copilot-resources/bugfix/latest-tag

include latest tag

Author: karpikpl

.github/workflows/deploy_to_ghcr_custom_tag.yaml

@@ -8,6 +8,10 @@ on:
         description: 'existing git tag to be used as tag for the Docker image e.g. "custom-tag"'
         required: true
         default: 'my-tag'
+      include_latest:
+        description: 'should latest tag be included in the image tag'
+        required: true
+        default: 'true'
 
 permissions:
   packages: write
@@ -40,6 +44,7 @@ jobs:
             org.opencontainers.image.source=${{ github.repository }}
           tags: |
             type=raw,enable=true,priority=1,value=${{ github.event.inputs.tag }}
+            type=raw,enable=${{ github.event.inputs.include_latest }},priority=2,value=latest
             type=sha
             type=ref,event=branch
             type=ref,event=pr
@@ -82,6 +87,7 @@ jobs:
             org.opencontainers.image.source=${{ github.repository }}
           tags: |
             type=raw,enable=true,priority=1,value=${{ github.event.inputs.tag }}
+            type=raw,enable=${{ github.event.inputs.include_latest }},priority=2,value=latest
             type=sha
             type=ref,event=branch
             type=ref,event=pr

.github/workflows/deploy_to_ghcr_tag_release.yaml

@@ -44,12 +44,9 @@ jobs:
           git add .
           git commit --signoff --message $version
 
-          echo "moving tag $version"
-          git tag --force $version
-          git push origin $version --force
-
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
+        continue-on-error: true
         with:
           title: '🚀Update version to ${{ steps.version.outputs.version }}'
           body: |
@@ -59,6 +56,12 @@ jobs:
           delete-branch: true
           labels: 'version-update'
           base: 'main'
+      
+      - name: Move tag ${{ steps.version.outputs.version }} to PR
+        run: |
+          echo "moving tag ${{ steps.version.outputs.version }}"
+          git tag --force ${{ steps.version.outputs.version }}
+          git push origin ${{ steps.version.outputs.version }} --force
 
   push_to_ghcr:
     runs-on: ubuntu-latest
@@ -86,6 +89,7 @@ jobs:
             org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
             org.opencontainers.image.source=${{ github.repository }}
           tags: |
+            type=raw,value=latest,enable=true
             type=sha
             type=ref,event=branch
             type=ref,event=pr
@@ -126,6 +130,7 @@ jobs:
             org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
             org.opencontainers.image.source=${{ github.repository }}
           tags: |
+            type=raw,value=latest,enable=true
             type=sha
             type=ref,event=branch
             type=ref,event=pr