From a11dca62a4e1a6daccc6d2128399c2de53f385e6 Mon Sep 17 00:00:00 2001 From: Eric Bus Date: Fri, 20 Nov 2026 10:43:02 +0100 Subject: [PATCH] ci: separate dev workflow so merging dev keeps main's build intact build-docker.yml (main, :latest) is restored to match main; build-docker-dev.yml only triggers on dev and tags :dev. Co-Authored-By: Claude Opus 5.5 --- .gitea/workflows/build-docker-dev.yml | 50 +++++++++++++++++++++++++++ .gitea/workflows/build-docker.yml | 18 ++++++---- 2 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 .gitea/workflows/build-docker-dev.yml diff --git a/.gitea/workflows/build-docker-dev.yml b/.gitea/workflows/build-docker-dev.yml new file mode 100644 index 00000000..f4ff458e --- /dev/null +++ b/.gitea/workflows/build-docker-dev.yml @@ -0,0 +1,50 @@ +name: Build and Deploy (dev) +run-name: ${{ gitea.actor }} is building ${{ gitea.repository }} + +on: + push: + branches: + - dev + +jobs: + build: + runs-on: ubuntu-latest + + env: + REGISTRY: git.gooienmeer.nl + IMAGE: git.gooienmeer.nl/nh_gooi/nhgooi.nl + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to Gitea Container Registry + run: | + echo "${{ secrets.REGISTRY_TOKEN }}" | \ + docker login "$REGISTRY" \ + -u "${{ gitea.actor }}" \ + --password-stdin + + - name: Build image + run: | + docker build \ + -t "$IMAGE:${{ gitea.sha }}" \ + -t "$IMAGE:dev" \ + . + + - name: Push image + run: | + docker push "$IMAGE:${{ gitea.sha }}" + docker push "$IMAGE:dev" + +# - name: Trigger deployment +# run: | +# curl --fail-with-body \ +# -X POST \ +# -H "Content-Type: application/json" \ +# -d '{ +# "image": "'"$IMAGE:${{ gitea.sha }}"'", +# "commit": "${{ gitea.sha }}", +# "repository": "${{ gitea.repository }}" +# }' \ +# "${{ secrets.DEPLOY_WEBHOOK_URL }}" diff --git a/.gitea/workflows/build-docker.yml b/.gitea/workflows/build-docker.yml index f4ff458e..fe8c907a 100644 --- a/.gitea/workflows/build-docker.yml +++ b/.gitea/workflows/build-docker.yml @@ -1,18 +1,24 @@ -name: Build and Deploy (dev) +name: Build and Deploy run-name: ${{ gitea.actor }} is building ${{ gitea.repository }} on: push: branches: - - dev + - main + paths: + - 'Dockerfile' + - 'composer.json' + - 'composer.lock' + - '.gitea/workflows/build-docker.yml' + - 'version' # Change this file to force rebuild jobs: build: runs-on: ubuntu-latest env: - REGISTRY: git.gooienmeer.nl - IMAGE: git.gooienmeer.nl/nh_gooi/nhgooi.nl + REGISTRY: git.nhgooi.nl + IMAGE: git.nhgooi.nl/nh_gooi/nhgooi.nl steps: - name: Checkout @@ -29,13 +35,13 @@ jobs: run: | docker build \ -t "$IMAGE:${{ gitea.sha }}" \ - -t "$IMAGE:dev" \ + -t "$IMAGE:latest" \ . - name: Push image run: | docker push "$IMAGE:${{ gitea.sha }}" - docker push "$IMAGE:dev" + docker push "$IMAGE:latest" # - name: Trigger deployment # run: |