Skip to content

Commit

Permalink
Main merge workflow updates
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts committed Oct 30, 2023
1 parent 92631b0 commit 3aeefb4
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
name: [database, backend-go, backend-java, backend-py, frontend]
name: [database, backend-go, backend-java, backend-py]
include:
- name: database
file: database/openshift.deploy.yml
overwrite: false
repository: bcgov/quickstart-openshift
- name: backend-go
file: backend-go/openshift.deploy.yml
overwrite: true
Expand All @@ -36,10 +35,6 @@ jobs:
file: backend-py/openshift.deploy.yml
overwrite: true
parameters: -p PROMOTE_MIGRATION=${{ github.repository }}/migrations-py:test
- name: frontend
file: frontend/openshift.deploy.yml
overwrite: true
repository: bcgov/quickstart-openshift
steps:
- uses: bcgov-nr/action-deployer-openshift@v2.0.0
with:
Expand Down Expand Up @@ -121,12 +116,11 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
name: [database, backend-go, backend-java, backend-py, frontend]
name: [database, backend-go, backend-java, backend-py]
include:
- name: database
file: database/openshift.deploy.yml
overwrite: false
repository: bcgov/quickstart-openshift
- name: backend-go
file: backend-go/openshift.deploy.yml
overwrite: true
Expand All @@ -141,11 +135,6 @@ jobs:
overwrite: true
parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
-p PROMOTE_MIGRATION=${{ github.repository }}/migrations-py:test
- name: frontend
file: frontend/openshift.deploy.yml
overwrite: true
parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
repository: bcgov/quickstart-openshift
steps:
- uses: bcgov-nr/action-deployer-openshift@v2.0.0
with:
Expand Down

0 comments on commit 3aeefb4

Please sign in to comment.