Skip to content

Commit

Permalink
Merge branch 'master' into feature/ACS-6300_Prepeare_Report_Portal_St…
Browse files Browse the repository at this point in the history
…atic_Launch_Name
  • Loading branch information
wojtekswieton authored Nov 23, 2023
2 parents 3eeb5ab + 049f1de commit b13cf8f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/actions/dbp-charts/verify-helm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ runs:
password: ${{ inputs.docker_password }}
- name: Get branch name
uses: >-
Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v4.0.0
Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v4.1.0
- name: Get commit msg
uses: >-
Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v4.0.0
Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v4.1.0
- name: Get a namespace to deploy on
id: k8sns
uses: >-
Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v4.0.0
Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v4.1.0
with:
branch_name: ${{ env.BRANCH_NAME }}
release_prefix: ${{ inputs.release_prefix }}
Expand All @@ -111,7 +111,7 @@ runs:
- name: Upload helm deployments logs as artifacts
if: always()
uses: >-
Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v4.0.0
Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v4.1.0
with:
namespace: ${{ steps.k8sns.outputs.namespace }}
- name: Uninstall Helm releases
Expand Down
3 changes: 1 addition & 2 deletions .github/actions/docker-build-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,10 @@ runs:

- name: Anchore Scan API Image
if: inputs.grype-scan-enabled == 'true'
uses: anchore/scan-action@24fd7c9060f3c96848dd1929fac8d796fb5ae4b4 # v3.3.6
uses: anchore/scan-action@62370b53ab026f5d09b9fb43a7b5ec4b73c1a8e0 # v3.3.7
id: scan
with:
fail-build: ${{ inputs.grype-fail-build }}
grype-version: v0.72.0
image: ghcr.io/alfresco/${{ env.IMAGE_NAME }}
output-format: sarif
severity-cutoff: critical
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.0.0
v4.1.0

0 comments on commit b13cf8f

Please sign in to comment.