From 552a8ff8d877df71c4dd95d770f978312f25bcce Mon Sep 17 00:00:00 2001 From: Fringg Date: Sat, 7 Feb 2026 13:57:54 +0300 Subject: [PATCH] chore: fix release-please to auto-bump Dockerfile and workflow versions - Switch release-please to manifest mode (config-file + manifest-file) - Add Dockerfile and docker workflow files as generic extra-files - Add x-release-please-version annotations for automatic version replacement - Bump hardcoded v3.6.0 to v3.7.0 to match current release --- .github/workflows/docker-hub.yml | 6 +++--- .github/workflows/docker-registry.yml | 6 +++--- .github/workflows/release-please.yml | 5 ++--- Dockerfile | 2 +- release-please-config.json | 17 ++++++++++++++++- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index 653a256e..42ab1936 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -36,15 +36,15 @@ jobs: TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🏷️ Собираем релизную версию: $VERSION" elif [[ $GITHUB_REF == refs/heads/main ]]; then - VERSION="v3.6.0-$(git rev-parse --short HEAD)" + VERSION="v3.7.0-$(git rev-parse --short HEAD)" # x-release-please-version TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🚀 Собираем версию из main: $VERSION" elif [[ $GITHUB_REF == refs/heads/dev ]]; then - VERSION="v3.6.0-dev-$(git rev-parse --short HEAD)" + VERSION="v3.7.0-dev-$(git rev-parse --short HEAD)" # x-release-please-version TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:dev,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🧪 Собираем dev версию: $VERSION" else - VERSION="v3.6.0-pr-$(git rev-parse --short HEAD)" + VERSION="v3.7.0-pr-$(git rev-parse --short HEAD)" # x-release-please-version TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:pr-$(git rev-parse --short HEAD)" echo "🔀 Собираем PR версию: $VERSION" fi diff --git a/.github/workflows/docker-registry.yml b/.github/workflows/docker-registry.yml index 26419c49..fa1a8488 100644 --- a/.github/workflows/docker-registry.yml +++ b/.github/workflows/docker-registry.yml @@ -49,13 +49,13 @@ jobs: VERSION=${GITHUB_REF#refs/tags/} echo "🏷️ Building release version: $VERSION" elif [[ $GITHUB_REF == refs/heads/main ]]; then - VERSION="v3.6.0-$(git rev-parse --short HEAD)" + VERSION="v3.7.0-$(git rev-parse --short HEAD)" # x-release-please-version echo "🚀 Building main version: $VERSION" elif [[ $GITHUB_REF == refs/heads/dev ]]; then - VERSION="v3.6.0-dev-$(git rev-parse --short HEAD)" + VERSION="v3.7.0-dev-$(git rev-parse --short HEAD)" # x-release-please-version echo "🧪 Building dev version: $VERSION" else - VERSION="v3.6.0-pr-$(git rev-parse --short HEAD)" + VERSION="v3.7.0-pr-$(git rev-parse --short HEAD)" # x-release-please-version echo "🔀 Building PR version: $VERSION" fi echo "version=$VERSION" >> $GITHUB_OUTPUT diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 04c8b2b9..a8edadc1 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -20,6 +20,5 @@ jobs: - uses: googleapis/release-please-action@v4 id: release with: - release-type: python - extra-files: | - pyproject.toml + config-file: release-please-config.json + manifest-file: .release-please-manifest.json diff --git a/Dockerfile b/Dockerfile index 468e8913..885bd17b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN pip install --no-cache-dir --upgrade pip && \ FROM python:3.13-slim -ARG VERSION="v3.6.0" +ARG VERSION="v3.7.0" # x-release-please-version ARG BUILD_DATE ARG VCS_REF diff --git a/release-please-config.json b/release-please-config.json index 455a0f1e..bc55cd53 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -6,7 +6,22 @@ "bump-patch-for-minor-pre-major": true, "include-component-in-tag": false, "extra-files": [ - "pyproject.toml" + "pyproject.toml", + { + "type": "generic", + "path": "Dockerfile", + "glob": false + }, + { + "type": "generic", + "path": ".github/workflows/docker-hub.yml", + "glob": false + }, + { + "type": "generic", + "path": ".github/workflows/docker-registry.yml", + "glob": false + } ], "changelog-sections": [ { "type": "feat", "section": "New Features" },