Skip to content

Commit

Permalink
Merge branch 'main' into grad-release
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
cditcher committed Dec 13, 2024
2 parents 228ae1f + adfdf4c commit 66b4f07
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ updates:
schedule:
interval: "daily"
target-branch: "grad-release"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,6 @@ jobs:
# now hit it with a zap scan
- name: ZAP Scan
uses: zaproxy/action-api-scan@v0.7.0
uses: zaproxy/action-api-scan@v0.9.0
with:
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
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,6 @@ jobs:
# now hit it with a zap scan
- name: ZAP Scan
uses: zaproxy/action-api-scan@v0.7.0
uses: zaproxy/action-api-scan@v0.9.0
with:
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,6 @@ jobs:
# now hit it with a zap scan
- name: ZAP Scan
uses: zaproxy/action-api-scan@v0.7.0
uses: zaproxy/action-api-scan@v0.9.0
with:
target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs'
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>
<groupId>ca.bc.gov</groupId>
<artifactId>educ-grad-business-api</artifactId>
<version>1.8.29</version>
<version>1.8.30</version>
<name>educ-grad-business-api</name>
<description>GRAD Business API for external clients</description>

Expand Down

0 comments on commit 66b4f07

Please sign in to comment.