Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Branch synching #489

Merged
merged 11 commits into from
Aug 12, 2024
Merged

Branch synching #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
31434ca
Update build.from.developer.branch.deploy.to.dev.yml
cditcher Jun 26, 2024
b938101
Update build.from.main.branch.deploy.to.dev.yml
cditcher Jun 26, 2024
195a5ee
Update build.from.release.branch.deploy.to.dev.yml
cditcher Jun 26, 2024
6c55f95
Update create_tag.yml
cditcher Jun 26, 2024
46cdf7d
Update deploy_prod.yml
cditcher Jun 26, 2024
8fecbc4
Update deploy_test.yml
cditcher Jun 26, 2024
040d160
Update on.pr.yml
cditcher Jun 26, 2024
fb004cf
Merge pull request #487 from bcgov/grad-release
githubmamatha Jul 9, 2024
2fa17fd
GRAD2-2799: fixed the issue on GPA calculation due to the wrong order…
infstar Jul 24, 2024
3610936
Merge pull request #488 from bcgov/hotfix/GRAD2-2799
infstar Jul 24, 2024
b7d91d7
Merge branch 'refs/heads/grad-release'
Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.from.developer.branch.deploy.to.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ jobs:
- name: ZAP Scan
uses: zaproxy/[email protected]
with:
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
2 changes: 1 addition & 1 deletion .github/workflows/build.from.main.branch.deploy.to.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@ jobs:
- name: ZAP Scan
uses: zaproxy/[email protected]
with:
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
2 changes: 1 addition & 1 deletion .github/workflows/build.from.release.branch.deploy.to.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ jobs:
- name: ZAP Scan
uses: zaproxy/[email protected]
with:
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
2 changes: 1 addition & 1 deletion .github/workflows/create_tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ jobs:
oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }}
oc project ${{ env.OPENSHIFT_NAMESPACE }}

oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:latest ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:${{ github.event.inputs.version }}
oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:latest ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:${{ github.event.inputs.version }}