Skip to content

Commit cc8c3d7

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 54cedf8 + 0262b9f commit cc8c3d7

File tree

2 files changed

+68
-45
lines changed

2 files changed

+68
-45
lines changed

.github/workflows/dispatch_build_dev.yaml

+45-45
Original file line numberDiff line numberDiff line change
@@ -30,51 +30,51 @@ jobs:
3030
author_name: Github Action Slack
3131

3232
docker:
33-
if: github.repository_owner == 'cloudforet-io'
34-
needs: versioning
35-
runs-on: ubuntu-latest
36-
env:
37-
VERSION: ${{ needs.versioning.outputs.version }}
38-
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v3
41-
with:
42-
token: ${{ secrets.PAT_TOKEN }}
43-
44-
- name: get service name
45-
run: |
46-
echo "SERVICE=$(echo ${{ github.repository }} | cut -d '/' -f2)" >> $GITHUB_ENV
47-
48-
- name: Set up QEMU
49-
uses: docker/setup-qemu-action@v2
50-
51-
- name: Set up Docker Buildx
52-
uses: docker/setup-buildx-action@v2
53-
54-
- name: Login to Docker Hub
55-
uses: docker/login-action@v2
56-
with:
57-
username: ${{ secrets.DOCKER_USERNAME }}
58-
password: ${{ secrets.DOCKER_PASSWORD }}
59-
60-
- name: Build and push to pyengine
61-
uses: docker/build-push-action@v4
62-
with:
63-
context: .
64-
push: true
65-
tags: pyengine/${{ env.SERVICE }}:${{ env.VERSION }}
66-
67-
- name: Notice when job fails
68-
if: failure()
69-
uses: 8398a7/[email protected]
70-
with:
71-
status: ${{job.status}}
72-
fields: repo,workflow,job
73-
author_name: Github Action Slack
33+
if: github.repository_owner == 'cloudforet-io'
34+
needs: versioning
35+
runs-on: ubuntu-latest
36+
env:
37+
VERSION: ${{ needs.versioning.outputs.version }}
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v3
41+
with:
42+
token: ${{ secrets.PAT_TOKEN }}
43+
44+
- name: get service name
45+
run: |
46+
echo "SERVICE=$(echo ${{ github.repository }} | cut -d '/' -f2)" >> $GITHUB_ENV
47+
48+
- name: Set up QEMU
49+
uses: docker/setup-qemu-action@v2
50+
51+
- name: Set up Docker Buildx
52+
uses: docker/setup-buildx-action@v2
53+
54+
- name: Login to Docker Hub
55+
uses: docker/login-action@v2
56+
with:
57+
username: ${{ secrets.DOCKER_USERNAME }}
58+
password: ${{ secrets.DOCKER_PASSWORD }}
59+
60+
- name: Build and push to pyengine
61+
uses: docker/build-push-action@v4
62+
with:
63+
context: .
64+
push: true
65+
tags: pyengine/${{ env.SERVICE }}:${{ env.VERSION }}
66+
67+
- name: Notice when job fails
68+
if: failure()
69+
uses: 8398a7/[email protected]
70+
with:
71+
status: ${{job.status}}
72+
fields: repo,workflow,job
73+
author_name: Github Action Slack
7474

7575
scan:
76-
needs: [versioning, docker]
77-
runs-on: ubuntu-20.04
76+
needs: [ versioning, docker ]
77+
runs-on: ubuntu-latest
7878
env:
7979
VERSION: ${{ needs.versioning.outputs.version }}
8080
steps:
@@ -90,7 +90,7 @@ jobs:
9090
severity: 'CRITICAL,HIGH'
9191

9292
- name: Upload Trivy scan results to GitHub Security tab
93-
uses: github/codeql-action/upload-sarif@v2
93+
uses: github/codeql-action/upload-sarif@v3
9494
with:
9595
sarif_file: 'trivy-results.sarif'
9696

@@ -102,7 +102,7 @@ jobs:
102102
echo "$count"
103103
104104
- name: slack
105-
if: ${{ steps.vulnerabilities.outputs.result_count != 0 }}
105+
if: ${{ steps.vulnerabilities.outputs.result_count != 0 }}
106106
uses: 8398a7/action-slack@v3
107107
with:
108108
status: custom
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "[Pull Request] Base Check"
2+
3+
on:
4+
pull_request_target:
5+
6+
jobs:
7+
check-pull-request:
8+
name: Check Pull Request
9+
runs-on: ubuntu-latest
10+
permissions:
11+
pull-requests: write
12+
steps:
13+
- name: Check signed commits
14+
id: review
15+
uses: cloudforet-io/check-pr-action@v1
16+
with:
17+
token: ${{ secrets.GITHUB_TOKEN }}
18+
19+
- name: Notify Result
20+
if: ${{ steps.review.outputs.signedoff == 'false' }}
21+
run: |
22+
echo "The review result is ${{ steps.review.outputs.signedoff }}"
23+
exit 1

0 commit comments

Comments
 (0)