From 21b2dffc37af2c603c509ec329ffed713ed0d355 Mon Sep 17 00:00:00 2001 From: Francwa Date: Sun, 21 Dec 2025 13:53:49 +0100 Subject: [PATCH] fix: added gitea token --- .gitea/workflows/ci.yml | 6 +++--- Makefile | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 466922b..f5793f6 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -30,13 +30,13 @@ jobs: name: Build & Push to Registry runs-on: ubuntu-latest needs: test + if: startsWith(github.ref, 'refs/tags/') steps: - name: Debug ref run: | echo "github.ref = ${{ github.ref }}" echo "GITHUB_REF = $GITHUB_REF" - echo "github.event_name = ${{ github.event_name }}" - exit 1 + echo "This should only run on tags!" - name: Checkout code uses: actions/checkout@v4 @@ -58,6 +58,6 @@ jobs: run: | docker tag ${{ steps.config.outputs.image_name }}:latest ${{ env.REGISTRY_URL }}/${{ env.REGISTRY_USER }}/${{ steps.config.outputs.image_name }}:${{ steps.version.outputs.version }} docker tag ${{ steps.config.outputs.image_name }}:latest ${{ env.REGISTRY_URL }}/${{ env.REGISTRY_USER }}/${{ steps.config.outputs.image_name }}:latest - echo "${{ secrets.GITEA_TOKEN }}" | docker login ${{ env.REGISTRY_URL }} -u ${{ env.REGISTRY_USER }} --password-stdin + echo "${{ secrets.G1T34_TOKEN }}" | docker login ${{ env.REGISTRY_URL }} -u ${{ env.REGISTRY_USER }} --password-stdin docker push ${{ env.REGISTRY_URL }}/${{ env.REGISTRY_USER }}/${{ steps.config.outputs.image_name }}:${{ steps.version.outputs.version }} docker push ${{ env.REGISTRY_URL }}/${{ env.REGISTRY_USER }}/${{ steps.config.outputs.image_name }}:latest diff --git a/Makefile b/Makefile index 0054959..63b342f 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ T = \033[36m R = \033[0m # --- TARGETS --- -.PHONY: add build build-test check-docker check-runner clean coverage down format help init-dotenv install install-hooks lint logs major minor patch prune ps restart run shell test up update _check_branch _ci-image-name _ci-run-tests +.PHONY: add build build-test check-docker check-runner clean coverage down format help init-dotenv install install-hooks lint logs major minor patch prune ps restart run shell test up update _check_branch _ci-image-name _ci-run-tests _push_tag # Catch-all for args %: @@ -134,7 +134,7 @@ help: @echo " $(T)update $(R) Update dependencies." @echo "" @echo "$(G)Versioning:$(R)" - @echo " $(T)major/minor/patch $(R) Bump version." + @echo " $(T)major/minor/patch $(R) Bump version and push tag (triggers CI/CD)." init-dotenv: @echo "$(T)🔑 Initializing .env file...$(R)" @@ -187,14 +187,17 @@ logs: check-docker major: _check_branch @echo "$(T)💥 Bumping major...$(R)" SKIP=all $(BUMP_CMD) major + @$(MAKE) -s _push_tag minor: _check_branch @echo "$(T)✨ Bumping minor...$(R)" SKIP=all $(BUMP_CMD) minor + @$(MAKE) -s _push_tag patch: _check_branch @echo "$(T)🚀 Bumping patch...$(R)" SKIP=all $(BUMP_CMD) patch + @$(MAKE) -s _push_tag prune: check-docker @echo "$(T)🗑️ Pruning Docker resources...$(R)" @@ -247,3 +250,8 @@ _ci-run-tests: build-test -e TMDB_API_KEY \ $(IMAGE_NAME):test pytest @echo "✅ Tests passed." + +_push_tag: + @echo "$(T)📦 Pushing tag...$(R)" + git push --tags + @echo "✅ Tag pushed. Check CI for build status."