From b92641722759ddedb10f703419fd7d4d8949be59 Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Wed, 10 Sep 2025 12:39:36 +0200 Subject: [PATCH] ci/docs: rely solely on branch name as DOCKER_TAG; remove tag triggers --- .gitea/workflows/dev.yml | 17 +++-------------- docs/ci.md | 10 ++-------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 95496e4..b6ca0be 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -1,8 +1,6 @@ name: dev on: push: - tags: - - dev branches: - '*' paths: @@ -22,8 +20,8 @@ jobs: uses: docker/login-action@v3 with: registry: git.4nkweb.com - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} + username: ${{ secrets.USER }} + password: ${{ secrets.TOKEN }} - name: Init submodules (ensure up-to-date) run: | git submodule sync --recursive @@ -32,14 +30,5 @@ jobs: env: REGISTRY: git.4nkweb.com run: | - COMMIT_MSG=$(git log -1 --pretty=%B) - FROM_COMMIT=$(printf "%s" "$COMMIT_MSG" | sed -n 's/.*ci:[[:space:]]*docker_tag=\([^ ][^\n]*\).*/\1/p' | head -n1) - if [ -n "$FROM_COMMIT" ]; then - DOCKER_TAG="$FROM_COMMIT" - elif [ -f .ci/tag.env ]; then - # shellcheck disable=SC1091 - . .ci/tag.env - else - DOCKER_TAG=$(git rev-parse --abbrev-ref HEAD) - fi + DOCKER_TAG=$(git rev-parse --abbrev-ref HEAD) bash scripts/build_and_push.sh "$DOCKER_TAG" diff --git a/docs/ci.md b/docs/ci.md index 4d5edb7..e69fb80 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -3,17 +3,11 @@ ## Workflow - Fichier: `.gitea/workflows/dev.yml` -- Triggers: - - Push sur `dev` - - Push sur branches `dev-test*` modifiant `.ci/tag.env` - - Tag `dev` +- Trigger unique: push sur n’importe quelle branche (`*`). ## Résolution de DOCKER_TAG -1. Motif dans le dernier message de commit: `ci: docker_tag=` -2. Fichier `.ci/tag.env` (clé `DOCKER_TAG=`) -3. Nom de la branche (`GITHUB_REF_NAME`) -4. Secours: `dev-test` +- Nom de la branche courante (la branche est le `DOCKER_TAG`). ## Build