Skip to content

Commit 350d3f1

Browse files
authored
Merge pull request #744 from bcgov/feat/ci-cd-fix
Feat/ci cd fix
2 parents d62be92 + 80843a0 commit 350d3f1

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

.github/workflows/_build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@ jobs:
161161
cache-to: type=gha,mode=max
162162
file: ./backend/applications/Dockerfile-migrations-openshift
163163

164-
- name: Build and push Migration image for Sites
165-
if: steps.check.outputs.build == 'true' && inputs.component == 'backend/sites'
166-
uses: docker/build-push-action@v3.1.1
167-
with:
168-
context: ./${{ inputs.component }}/
169-
push: true
170-
tags: ghcr.io/${{ github.repository }}/backend/sites-migration:${{ inputs.img_build }}
171-
cache-from: type=gha
172-
cache-to: type=gha,mode=max
173-
file: ./backend/sites/Dockerfile-migrations-openshift
164+
# - name: Build and push Migration image for Sites
165+
# if: steps.check.outputs.build == 'true' && inputs.component == 'backend/sites'
166+
# uses: docker/build-push-action@v3.1.1
167+
# with:
168+
# context: ./${{ inputs.component }}/
169+
# push: true
170+
# tags: ghcr.io/${{ github.repository }}/backend/sites-migration:${{ inputs.img_build }}
171+
# cache-from: type=gha
172+
# cache-to: type=gha,mode=max
173+
# file: ./backend/sites/Dockerfile-migrations-openshift
174174

.github/workflows/ci-cd-openshift-dev.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: ./.github/workflows/_build.yml
2323
strategy:
2424
matrix:
25-
component: [backend/applications, backend/gateway, backend/legacy, backend/users, backend/sites, frontend]
25+
component: [backend/applications, backend/gateway, backend/legacy, backend/users, frontend]
2626
include:
2727
- component: backend/applications
2828
triggers: ('backend/applications/')
@@ -32,8 +32,6 @@ jobs:
3232
triggers: ('backend/legacy/')
3333
- component: backend/users
3434
triggers: ('backend/users/')
35-
- component: backend/sites
36-
triggers: ('backend/sites/')
3735
- component: frontend
3836
triggers: ('frontend/')
3937
secrets:
@@ -50,7 +48,7 @@ jobs:
5048
uses: ./.github/workflows/_code-cov.yml
5149
strategy:
5250
matrix:
53-
component: [backend/applications, backend/gateway, backend/users, backend/sites, frontend]
51+
component: [backend/applications, backend/gateway, backend/users, frontend]
5452
secrets:
5553
gh_token: ${{ secrets.GITHUB_TOKEN }}
5654
with:
@@ -68,7 +66,7 @@ jobs:
6866
uses: ./.github/workflows/_deploy.yml
6967
strategy:
7068
matrix:
71-
component: [backend/applications, backend/gateway, backend/legacy, backend/users, backend/sites, database, frontend]
69+
component: [backend/applications, backend/gateway, backend/legacy, backend/users, database, frontend]
7270
include:
7371
- component: database
7472
overwrite: false
@@ -90,10 +88,6 @@ jobs:
9088
overwrite: true
9189
template_file: .github/openshift/deploy.backend-users.yml
9290
template_vars: -p PROMOTE=${{ github.repository }}/backend/users -p CONTAINER_PORT=4005 -p ENV=dev -p IMAGE_TAG=dev
93-
- component: backend/sites
94-
overwrite: true
95-
template_file: .github/openshift/deploy.backend-sites.yml
96-
template_vars: -p PROMOTE=${{ github.repository }}/backend/sites -p CONTAINER_PORT=4007 -p ENV=dev -p IMAGE_TAG=dev
9791
- component: frontend
9892
overwrite: true
9993
template_file: .github/openshift/deploy.frontend.yml

0 commit comments

Comments
 (0)