Skip to content

Commit d848cfd

Browse files
authored
fix: DTOSS-7928 fix the trigger to run the image building process workflow (#828)
fix: DTOSS-7928 fix the trigger to run the image building process
1 parent 591b330 commit d848cfd

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

.github/workflows/cicd-1-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
name: "Image build stage"
104104
needs: [metadata, commit-stage, test-stage]
105105
uses: NHSDigital/dtos-devops-templates/.github/workflows/stage-3-build-images.yaml@main
106-
if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
106+
if: needs.metadata.outputs.does_pull_request_exist == 'true' || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
107107
with:
108108
docker_compose_file: application/CohortManager/compose.core.yaml,application/CohortManager/compose.cohort-distribution.yaml
109109
excluded_containers_csv_list: azurite,azurite-setup,sql-edge,db-setup

.github/workflows/cicd-2-publish.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151
export VERSION="${{ steps.variables.outputs.version }}"
5252
make list-variables
5353
54-
publish:
55-
name: "Build and publish image stage"
56-
# runs-on: ubuntu-latest
57-
needs: [metadata]
58-
uses: ./.github/workflows/stage-3-build-images.yaml
59-
if: github.event.pull_request.merged == true
60-
with:
61-
environment_tag: "${{ needs.metadata.outputs.environment_tag }}"
62-
secrets: inherit
54+
# publish:
55+
# name: "Build and publish image stage"
56+
# # runs-on: ubuntu-latest
57+
# needs: [metadata]
58+
# uses: ./.github/workflows/stage-3-build-images.yaml
59+
# if: github.event.pull_request.merged == true
60+
# with:
61+
# environment_tag: "${{ needs.metadata.outputs.environment_tag }}"
62+
# secrets: inherit
6363
# timeout-minutes: 3
6464
# steps:
6565
# - name: "Checkout code"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rebuild_all_images

0 commit comments

Comments
 (0)