diff --git a/.gitea/workflows/gobuild.yaml b/.gitea/workflows/gobuild.yaml index 7a60eb7..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,9 +12,16 @@ 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//\//-} + + 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