From 8ba634575eaef18e514bac0f75eb5d1a827903f4 Mon Sep 17 00:00:00 2001 From: Aaron Boyle Date: Sat, 26 Jul 2025 22:01:50 +0100 Subject: [PATCH 1/3] removes dev and staging builds --- .github/workflows/build-from-main.yml | 84 --------------------------- 1 file changed, 84 deletions(-) diff --git a/.github/workflows/build-from-main.yml b/.github/workflows/build-from-main.yml index 53e033180..d361b8ed5 100644 --- a/.github/workflows/build-from-main.yml +++ b/.github/workflows/build-from-main.yml @@ -83,90 +83,6 @@ jobs: dockerfile: ./govtool/metadata-validation/Dockerfile image: ghcr.io/${{ github.repository }}-metadata-validation qovery_container_name: govtool-metadata-validation - - branch: staging - network: preview-govtool - workdir: ./govtool/backend - name: govtool-backend - dockerfile: ./govtool/backend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-backend - qovery_container_name: govtool-backend - - branch: staging - network: preview-govtool - workdir: ./govtool/frontend - name: govtool-frontend - dockerfile: ./govtool/frontend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-frontend - qovery_container_name: govtool-frontend - - branch: staging - network: preview-govtool - workdir: ./govtool/metadata-validation - name: govtool-metadata-validation - dockerfile: ./govtool/metadata-validation/Dockerfile - image: ghcr.io/${{ github.repository }}-metadata-validation - qovery_container_name: govtool-metadata-validation - - branch: staging - network: pre-prod-govtool - workdir: ./govtool/backend - name: govtool-backend - dockerfile: ./govtool/backend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-backend - qovery_container_name: govtool-backend - - branch: staging - network: pre-prod-govtool - workdir: ./govtool/frontend - name: govtool-frontend - dockerfile: ./govtool/frontend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-frontend - qovery_container_name: govtool-frontend - - branch: staging - network: pre-prod-govtool - workdir: ./govtool/metadata-validation - name: govtool-metadata-validation - dockerfile: ./govtool/metadata-validation/Dockerfile - image: ghcr.io/${{ github.repository }}-metadata-validation - qovery_container_name: govtool-metadata-validation - - branch: staging - network: prod-govtool - workdir: ./govtool/backend - name: govtool-backend - dockerfile: ./govtool/backend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-backend - qovery_container_name: govtool-backend - - branch: staging - network: prod-govtool - workdir: ./govtool/frontend - name: govtool-frontend - dockerfile: ./govtool/frontend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-frontend - qovery_container_name: govtool-frontend - - branch: staging - network: prod-govtool - workdir: ./govtool/metadata-validation - name: govtool-metadata-validation - dockerfile: ./govtool/metadata-validation/Dockerfile - image: ghcr.io/${{ github.repository }}-metadata-validation - qovery_container_name: govtool-metadata-validation - - branch: develop - network: dev-govtool - workdir: ./govtool/backend - name: govtool-backend - dockerfile: ./govtool/backend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-backend - qovery_container_name: govtool-backend - - branch: develop - network: dev-govtool - workdir: ./govtool/frontend - name: govtool-frontend - dockerfile: ./govtool/frontend/Dockerfile.qovery - image: ghcr.io/${{ github.repository }}-frontend - qovery_container_name: govtool-frontend - - branch: develop - network: dev-govtool - workdir: ./govtool/metadata-validation - name: govtool-metadata-validation - dockerfile: ./govtool/metadata-validation/Dockerfile - image: ghcr.io/${{ github.repository }}-metadata-validation - qovery_container_name: govtool-metadata-validation runs-on: ubuntu-latest steps: From c1654f5d01c2989482d2e8af6029807294cb8360 Mon Sep 17 00:00:00 2001 From: Aaron Boyle Date: Sat, 26 Jul 2025 22:01:57 +0100 Subject: [PATCH 2/3] removes dev and staging builds --- .github/workflows/build-from-main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-from-main.yml b/.github/workflows/build-from-main.yml index d361b8ed5..48d283cdb 100644 --- a/.github/workflows/build-from-main.yml +++ b/.github/workflows/build-from-main.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - staging workflow_dispatch: permissions: From 534fbb16264af124edd024a9f041dbd0833c1aa3 Mon Sep 17 00:00:00 2001 From: Aaron Boyle Date: Sat, 26 Jul 2025 22:04:59 +0100 Subject: [PATCH 3/3] updates trigger contitions to build image from develop --- .github/workflows/merge.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 5af2282e3..0511b4023 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -1,7 +1,10 @@ name: Check,Build,Deploy on: - workflow_dispatch + push: + branches: + - develop + workflow_dispatch: permissions: contents: write