Skip to content

Commit

Permalink
Merge branch 'master' into linting
Browse files Browse the repository at this point in the history
  • Loading branch information
filariow authored Apr 8, 2024
2 parents 74e1f57 + 77aa3d4 commit 16e402d
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 38 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/ci-golang-sbom.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: ci-build
on:
push:
branches:
- master
tags-ignore:
- '*.*'
pull_request:
branches:
- master

jobs:
golangci:
name: GolangCI Lint
runs-on: ubuntu-20.04
steps:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v4

- name: Generate Assets
run: |
make generate-assets
- name: Lint
uses: golangci/golangci-lint-action@v4
with:
version: v1.56.2
skip-pkg-cache: true
skip-build-cache: true
args: --config=./.golangci.yml --verbose

sbom:
name: Generate SBOM
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Generate SBOM
uses: CycloneDX/gh-gomod-generate-sbom@v2
with:
version: v1
args: mod -licenses -json -output -
2 changes: 1 addition & 1 deletion .github/workflows/publish-operators-for-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# Is executed only for comment events - in that case the pull_request field is empty
- name: Send Github API Request to get PR data
id: request
uses: octokit/request-action@v2.2.0
uses: octokit/request-action@v2.3.0
if: ${{ github.event.pull_request == '' }}
with:
route: ${{ github.event.issue.pull_request.url }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,40 +43,3 @@ jobs:
flags: unittests # optional
fail_ci_if_error: true # optional (default = false)
verbose: true # optional (default = false)

golangci:
name: GolangCI Lint
runs-on: ubuntu-20.04
steps:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v4

- name: Generate Assets
run: |
make generate-assets
- name: Lint
uses: golangci/golangci-lint-action@v4
with:
version: v1.56.2
skip-pkg-cache: true
skip-build-cache: true
args: --config=./.golangci.yml --verbose

sbom:
name: Generate SBOM
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Generate SBOM
uses: CycloneDX/gh-gomod-generate-sbom@v2
with:
version: v1
args: mod -licenses -json -output -

0 comments on commit 16e402d

Please sign in to comment.