Skip to content

Commit d273ba6

Browse files
authored
Merge branch 'master' into add-gitleaks
2 parents 2315eaf + f2b2c27 commit d273ba6

File tree

334 files changed

+14676
-10451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+14676
-10451
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# Install golang
1313
- uses: actions/setup-go@v2
1414
with:
15-
go-version: 1.17
15+
go-version: 1.18
1616

1717
- uses: actions/checkout@v2
1818
with:
@@ -49,30 +49,14 @@ jobs:
4949
tar -zxvf gitleaks_8.18.2_linux_x64.tar.gz && \
5050
sudo mv gitleaks /usr/local/bin && gitleaks detect --source . -v
5151
52-
security:
53-
container:
54-
image: litmuschaos/snyk:1.0
55-
volumes:
56-
- /home/runner/work/_actions/:/home/runner/work/_actions/
57-
runs-on: ubuntu-latest
58-
steps:
59-
- uses: actions/checkout@v2
60-
- uses: snyk/actions/setup@master
61-
- run: snyk auth ${SNYK_TOKEN}
62-
- uses: actions/setup-go@v1
63-
with:
64-
go-version: '1.17'
65-
- name: Snyk monitor
66-
run: snyk test
67-
6852
build:
6953
needs: pre-checks
7054
runs-on: ubuntu-latest
7155
steps:
7256
# Install golang
7357
- uses: actions/setup-go@v2
7458
with:
75-
go-version: 1.17
59+
go-version: 1.18
7660

7761
- uses: actions/checkout@v2
7862
with:
@@ -117,4 +101,4 @@ jobs:
117101
exit-code: '1'
118102
ignore-unfixed: true
119103
vuln-type: 'os,library'
120-
severity: 'CRITICAL,HIGH'
104+
severity: 'CRITICAL,HIGH'

.github/workflows/push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Install golang
1414
- uses: actions/setup-go@v2
1515
with:
16-
go-version: 1.17
16+
go-version: 1.18
1717
- uses: actions/checkout@v2
1818

1919
#TODO: Add Dockerfile linting
@@ -43,7 +43,7 @@ jobs:
4343
# Install golang
4444
- uses: actions/setup-go@v2
4545
with:
46-
go-version: 1.17
46+
go-version: 1.18
4747
- uses: actions/checkout@v2
4848

4949
- name: Set up QEMU
@@ -69,4 +69,4 @@ jobs:
6969
push: true
7070
file: build/Dockerfile
7171
platforms: linux/amd64,linux/arm64
72-
tags: litmuschaos/go-runner:ci
72+
tags: litmuschaos/go-runner:ci

.github/workflows/release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ on:
88
jobs:
99
pre-checks:
1010
runs-on: ubuntu-latest
11-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
1211
steps:
1312
# Install golang
1413
- uses: actions/setup-go@v2
1514
with:
16-
go-version: 1.17
15+
go-version: 1.18
1716
- uses: actions/checkout@v2
1817

1918
#TODO: Add Dockerfile linting
@@ -24,13 +23,12 @@ jobs:
2423
make gotasks
2524
push:
2625
needs: pre-checks
27-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
2826
runs-on: ubuntu-latest
2927
steps:
3028
# Install golang
3129
- uses: actions/setup-go@v2
3230
with:
33-
go-version: 1.17
31+
go-version: 1.18
3432
- uses: actions/checkout@v2
3533

3634
- name: Set Tag
@@ -43,7 +41,7 @@ jobs:
4341
run: |
4442
echo "RELEASE TAG: ${RELEASE_TAG}"
4543
echo "${RELEASE_TAG}" > ${{ github.workspace }}/tag.txt
46-
44+
4745
- name: Set up QEMU
4846
uses: docker/setup-qemu-action@v1
4947
with:
@@ -63,10 +61,10 @@ jobs:
6361

6462
- name: Build and push
6563
uses: docker/build-push-action@v2
66-
env:
64+
env:
6765
RELEASE_TAG: ${{ env.RELEASE_TAG }}
6866
with:
6967
push: true
7068
file: build/Dockerfile
7169
platforms: linux/amd64,linux/arm64
72-
tags: litmuschaos/go-runner:${{ env.RELEASE_TAG }},litmuschaos/go-runner:latest
70+
tags: litmuschaos/go-runner:${{ env.RELEASE_TAG }},litmuschaos/go-runner:latest

0 commit comments

Comments
 (0)