From 75b3abbdc380f2898a6cae54f24d4b4cc54f91bd Mon Sep 17 00:00:00 2001 From: Tueem Date: Sat, 17 Jan 2026 21:56:39 +0100 Subject: [PATCH 1/2] fix(ci): ensure on "/" in git ref name --- .gitea/workflows/gobuild.yaml | 8 +++++--- .gitignore | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/gobuild.yaml b/.gitea/workflows/gobuild.yaml index 7a60eb7..5ae723f 100644 --- a/.gitea/workflows/gobuild.yaml +++ b/.gitea/workflows/gobuild.yaml @@ -11,9 +11,11 @@ jobs: steps: - name: Set VERSION env var run: | - VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10} - echo $VERSION - echo "VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10}" >> $GITHUB_ENV + SANITIZED_REF_NAME=${GITHUB_REF_NAME//\//-} + VERSION=${SANITIZED_REF_NAME}-${GITHUB_SHA::10} + + echo "$VERSION" + echo "VERSION=$VERSION" >> "$GITHUB_ENV" - name: Checkout code uses: actions/checkout@v5 diff --git a/.gitignore b/.gitignore index 51782d7..c0f5120 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ go.work go.work.sum # env file -.env \ No newline at end of file +.env +storage.db From 12d7faa13f916f6faf795cd3126324d99d8c35b4 Mon Sep 17 00:00:00 2001 From: Tueem Date: Sat, 17 Jan 2026 22:22:56 +0100 Subject: [PATCH 2/2] fix(ci): edit version string --- .gitea/workflows/gobuild.yaml | 14 ++++++++++---- .gitea/workflows/release-docker.yaml | 17 ++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/gobuild.yaml b/.gitea/workflows/gobuild.yaml index 5ae723f..b40f5eb 100644 --- a/.gitea/workflows/gobuild.yaml +++ b/.gitea/workflows/gobuild.yaml @@ -1,6 +1,7 @@ name: build on: + pull_request: push: branches-ignore: - main @@ -11,11 +12,16 @@ jobs: steps: - name: Set VERSION env var run: | - SANITIZED_REF_NAME=${GITHUB_REF_NAME//\//-} - VERSION=${SANITIZED_REF_NAME}-${GITHUB_SHA::10} + SANITIZED_REF_NAME=${GITHUB_REF_NAME//\//-} - echo "$VERSION" - echo "VERSION=$VERSION" >> "$GITHUB_ENV" + if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then + VERSION="$SANITIZED_REF_NAME" + else + VERSION="$SANITIZED_REF_NAME-${GITHUB_SHA::10}" + fi + + echo "$VERSION" + echo "VERSION=$VERSION" >> "$GITHUB_ENV"'' - name: Checkout code uses: actions/checkout@v5 diff --git a/.gitea/workflows/release-docker.yaml b/.gitea/workflows/release-docker.yaml index 065b3d7..df1919e 100644 --- a/.gitea/workflows/release-docker.yaml +++ b/.gitea/workflows/release-docker.yaml @@ -1,23 +1,26 @@ name: docker on: - pull_request: push: branches: - 'main' -env: - VERSION: ${{ github.ref_name }}-${{ github.sha }} - jobs: docker: runs-on: ubuntu-latest steps: - name: Set VERSION env var run: | - VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10} - echo $VERSION - echo "VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::10}" >> $GITHUB_ENV + SANITIZED_REF_NAME=${GITHUB_REF_NAME//\//-} + + if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then + VERSION="$SANITIZED_REF_NAME" + else + VERSION="$SANITIZED_REF_NAME-${GITHUB_SHA::10}" + fi + + echo "$VERSION" + echo "VERSION=$VERSION" >> "$GITHUB_ENV"'' - name: Login to Docker Hub uses: docker/login-action@v3