Skip to content

Commit 2e9be4c

Browse files
committed
Merge remote-tracking branch 'origin' into feature/nuxt
2 parents 6c25a4c + 612d7d9 commit 2e9be4c

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

.github/workflows/deploy_to_ghcr_custom_tag.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
description: 'existing git tag to be used as tag for the Docker image e.g. "custom-tag"'
99
required: true
1010
default: 'my-tag'
11+
include_latest:
12+
description: 'should latest tag be included in the image tag'
13+
required: true
14+
default: 'true'
1115

1216
permissions:
1317
packages: write
@@ -42,6 +46,7 @@ jobs:
4246
org.opencontainers.image.source=${{ github.repository }}
4347
tags: |
4448
type=raw,enable=true,priority=1,value=${{ github.event.inputs.tag }}
49+
type=raw,enable=${{ github.event.inputs.include_latest }},priority=2,value=latest
4550
type=sha
4651
type=ref,event=branch
4752
type=ref,event=pr

.github/workflows/deploy_to_ghcr_tag_release.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@ jobs:
4141
git add .
4242
git commit --signoff --message $version
4343
44-
echo "moving tag $version"
45-
git tag --force $version
46-
git push origin $version --force
47-
4844
- name: Create Pull Request
4945
uses: peter-evans/create-pull-request@v7
46+
continue-on-error: true
5047
with:
5148
title: '🚀Update version to ${{ steps.version.outputs.version }}'
5249
body: |
@@ -56,6 +53,12 @@ jobs:
5653
delete-branch: true
5754
labels: 'version-update'
5855
base: 'main'
56+
57+
- name: Move tag ${{ steps.version.outputs.version }} to PR
58+
run: |
59+
echo "moving tag ${{ steps.version.outputs.version }}"
60+
git tag --force ${{ steps.version.outputs.version }}
61+
git push origin ${{ steps.version.outputs.version }} --force
5962
6063
push_to_ghcr:
6164
runs-on: ubuntu-latest
@@ -85,6 +88,7 @@ jobs:
8588
org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
8689
org.opencontainers.image.source=${{ github.repository }}
8790
tags: |
91+
type=raw,value=latest,enable=true
8892
type=sha
8993
type=ref,event=branch
9094
type=ref,event=pr

package-lock.json

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "copilot-metrics-viewer",
3-
"version": "1.9.0",
3+
"version": "1.9.1",
44
"private": true,
55
"type": "module",
66
"scripts": {

0 commit comments

Comments
 (0)