Skip to content

Commit

Permalink
Merge branch 'master' into feature-identity-v2
Browse files Browse the repository at this point in the history
Signed-off-by: ImMino <[email protected]>
  • Loading branch information
ImMin5 authored Nov 23, 2023
2 parents 035caeb + a01c3d3 commit 83735c5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/dispatch_daily_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ jobs:
cloudforetdev/${{ github.event.repository.name }}:${{ env.TIME }}
build-args: |
PACKAGE_VERSION=${{ env.PACKAGE_VERSION }}
BRANCH_NAME=${{ env.BRANCH }}
BRANCH_NAME=${{ env.BRANCH_NAME }}
provenance: false

- name: Notice when job fails
if: failure()
Expand All @@ -74,7 +75,7 @@ jobs:
ignore-unfixed: true
vuln-type: 'os,library'
severity: 'CRITICAL,HIGH'

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
Expand Down Expand Up @@ -134,7 +135,7 @@ jobs:
]
}
env:
SLACK_WEBHOOK_URL: ${{secrets.VULNERABILITY_SLACK_WEBHOOK_URL}}
SLACK_WEBHOOK_URL: ${{secrets.VULNERABILITY_SLACK_WEBHOOK_URL}}

notification:
needs: docker
Expand All @@ -146,4 +147,4 @@ jobs:
with:
status: ${{job.status}}
fields: repo,message,commit,author,action,ref,workflow,job
author_name: Github Action Slack
author_name: Github Action Slack
5 changes: 3 additions & 2 deletions .github/workflows/dispatch_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ on:
version:
description: 'enter version(x.y.z)'
required: true
default: '1.0.0'
default: '2.0.0'
container_arch:
type: choice
description: 'choose container architecture'
default: linux/amd64,linux/arm64
default: linux/amd64
options:
- "linux/amd64"
- "linux/amd64,linux/arm64"
Expand Down Expand Up @@ -139,6 +139,7 @@ jobs:
build-args: |
PACKAGE_VERSION=${{ env.PACKAGE_VERSION }}
BRANCH_NAME=${{ env.BRANCH_NAME }}
provenance: false

- name: Notice when job fails
if: failure()
Expand Down

0 comments on commit 83735c5

Please sign in to comment.