Skip to content

Commit ce8838a

Browse files
authored
Merge pull request #166 from smlx/update-action
feat: use ccv action instead of custom hackery
2 parents 3b53b39 + 01920a9 commit ce8838a

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

.github/workflows/build.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,21 @@ jobs:
5151
file: Dockerfile
5252
build-args: BINARY=${{ matrix.binary }}
5353
context: dist/${{ matrix.binary }}_linux_amd64_v1
54+
check-tag:
55+
permissions:
56+
contents: read
57+
runs-on: ubuntu-latest
58+
steps:
59+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
60+
with:
61+
fetch-depth: 0
62+
- id: ccv
63+
uses: smlx/ccv@c5f6769c943c082c4e8d8ccf2ec4b6f5f517e1f2 # v0.7.3
64+
with:
65+
write-tag: false
66+
- run: |
67+
echo "new-tag=$NEW_TAG"
68+
echo "new-tag-version=$NEW_TAG_VERSION"
69+
env:
70+
NEW_TAG: ${{steps.ccv.outputs.new-tag}}
71+
NEW_TAG_VERSION: ${{steps.ccv.outputs.new-tag-version}}

.github/workflows/release.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
contents: write
1212
runs-on: ubuntu-latest
1313
outputs:
14-
new-tag: ${{ steps.bump-tag.outputs.new }}
15-
new-tag-version: ${{ steps.bump-tag.outputs.new_tag_version }}
14+
new-tag: ${{ steps.ccv.outputs.new-tag }}
15+
new-tag-version: ${{ steps.ccv.outputs.new-tag-version }}
1616
steps:
1717
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
1818
with:
@@ -24,19 +24,9 @@ jobs:
2424
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2525
with:
2626
go-version: stable
27-
- name: Install ccv
28-
run: >
29-
curl -sSL https://github.com/smlx/ccv/releases/download/v0.3.2/ccv_0.3.2_linux_amd64.tar.gz
30-
| sudo tar -xz -C /usr/local/bin ccv
3127
- name: Bump tag if necessary
32-
id: bump-tag
33-
run: |
34-
if [ -z "$(git tag -l "$(ccv)")" ]; then
35-
git tag "$(ccv)"
36-
git push --tags
37-
echo "new=true" >> "$GITHUB_OUTPUT"
38-
echo "new_tag_version=$(git tag --points-at HEAD)" >> "$GITHUB_OUTPUT"
39-
fi
28+
id: ccv
29+
uses: smlx/ccv@c5f6769c943c082c4e8d8ccf2ec4b6f5f517e1f2 # v0.7.3
4030
release-build:
4131
permissions:
4232
# create release

0 commit comments

Comments
 (0)