diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index c9064e4..9b7af1e 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -78,17 +78,6 @@ jobs: configuration: ".gitea/changelog-config.json" env: GITHUB_TOKEN: ${{ secrets.GITEA_TOKEN }} - - name: Build and store Docker image - if: ${{ github.event.inputs.docker_release == 'true' }} - env: - TAG: ${{ github.sha }} - run: | - REPO_NAME=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]') - docker buildx build \ - --platform linux/amd64 \ - --tag ${{ secrets.REGISTRY }}/${REPO_NAME}:latest \ - --tag ${{ secrets.REGISTRY }}/${REPO_NAME}:${TAG} \ - --push . - name: Bump version @@ -102,6 +91,15 @@ jobs: echo "EOF" >> $GITHUB_ENV - name: Check version run: echo ${{ env.VERSION }} + - name: Build and store Docker image + if: ${{ github.event.inputs.docker_release == 'true' }} + run: | + REPO_NAME=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]') + docker buildx build \ + --platform linux/amd64 \ + --tag ${{ secrets.REGISTRY }}/${REPO_NAME}:latest \ + --tag ${{ secrets.REGISTRY }}/${REPO_NAME}:${{ env.VERSION }} \ + --push . - name: Push changes uses: ad-m/github-push-action@master with: @@ -112,7 +110,7 @@ jobs: if: ${{ github.event.inputs.github_release == 'true' }} uses: softprops/action-gh-release@master with: - tag_name: ${{ env.VERSION }} + tag_name: v${{ env.VERSION }} release_name: Release ${{ env.VERSION }} body_path: release_notes/release_notes.md draft: false diff --git a/pyproject.toml b/pyproject.toml index 21bd757..5247f22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,12 +36,12 @@ replace = "{new_version}" regex = false ignore_missing_version = false ignore_missing_files = false -tag = false +tag = true sign_tags = false tag_name = "v{new_version}" tag_message = "Bump version: {current_version} → {new_version}" -allow_dirty = false -commit = false +allow_dirty = true +commit = true message = "Bump version: {current_version} → {new_version}" moveable_tags = [] commit_args = ""