Skip to content

Commit 408f43b

Browse files
chore(deps): Bump github/codeql-action from 4.31.2 to 4.31.4 (#537)
* chore(deps): Bump github/codeql-action from 4.31.2 to 4.31.4 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.2 to 4.31.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@0499de3...e12f017) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.31.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * remove nix Signed-off-by: Bence Csati <bence.csati@axoflow.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Bence Csati <bence.csati@axoflow.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bence Csati <bence.csati@axoflow.com>
1 parent de09c30 commit 408f43b

File tree

12 files changed

+51
-502
lines changed

12 files changed

+51
-502
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/.devenv/
2-
/.direnv/
31
/.github/
42
/bin/
53
/build/

.envrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/renovate.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/artifacts.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
retention-days: 5
189189

190190
- name: Upload Trivy scan results to GitHub Security tab
191-
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
191+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
192192
with:
193193
sarif_file: trivy-results.sarif
194194

@@ -323,6 +323,6 @@ jobs:
323323
retention-days: 5
324324

325325
- name: Upload Trivy scan results to GitHub Security tab
326-
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
326+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
327327
with:
328328
sarif_file: trivy-results.sarif

.github/workflows/ci.yaml

Lines changed: 41 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2323

24-
- name: Set up Nix
25-
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
24+
- name: Set up Go
25+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
2626
with:
27-
extra_nix_config: |
28-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
27+
go-version-file: '.go-version'
2928

3029
- name: Set up Go cache
3130
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -37,11 +36,8 @@ jobs:
3736
restore-keys: |
3837
${{ github.job }}-${{ runner.os }}-go-
3938
40-
- name: Prepare Nix shell
41-
run: nix develop --impure .#ci
42-
4339
- name: Build
44-
run: nix develop --impure .#ci -c make build
40+
run: make build
4541

4642
test:
4743
name: Test
@@ -51,11 +47,10 @@ jobs:
5147
- name: Checkout repository
5248
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5349

54-
- name: Set up Nix
55-
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
50+
- name: Set up Go
51+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
5652
with:
57-
extra_nix_config: |
58-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
53+
go-version-file: '.go-version'
5954

6055
- name: Set up Go cache
6156
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -67,11 +62,8 @@ jobs:
6762
restore-keys: |
6863
${{ github.job }}-${{ runner.os }}-go-
6964
70-
- name: Prepare Nix shell
71-
run: nix develop --impure .#ci
72-
7365
- name: Test
74-
run: nix develop --impure .#ci -c make test
66+
run: make test
7567

7668
lint:
7769
name: Lint
@@ -81,11 +73,10 @@ jobs:
8173
- name: Checkout repository
8274
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8375

84-
- name: Set up Nix
85-
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
76+
- name: Set up Go
77+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
8678
with:
87-
extra_nix_config: |
88-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
79+
go-version-file: '.go-version'
8980

9081
- name: Set up Go cache
9182
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -97,11 +88,25 @@ jobs:
9788
restore-keys: |
9889
${{ github.job }}-${{ runner.os }}-go-
9990
100-
- name: Prepare Nix shell
101-
run: nix develop --impure .#ci
91+
- name: Make deps
92+
run: make deps
10293

103-
- name: Lint
104-
run: nix develop --impure .#ci -c make lint -j
94+
- name: Lint Go code
95+
run: make lint-go
96+
97+
- name: Lint Helm charts
98+
run: make lint-helm
99+
100+
- name: Run Hadolint
101+
uses: hadolint/hadolint-action@v3.3.0
102+
with:
103+
dockerfile: Dockerfile
104+
config: .hadolint.yaml
105+
106+
- name: Run Yamllint
107+
run: |
108+
pip install --user yamllint
109+
yamllint .
105110
106111
license-check:
107112
name: License check
@@ -111,11 +116,10 @@ jobs:
111116
- name: Checkout repository
112117
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
113118

114-
- name: Set up Nix
115-
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
119+
- name: Set up Go
120+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
116121
with:
117-
extra_nix_config: |
118-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
122+
go-version-file: '.go-version'
119123

120124
- name: Set up Go cache
121125
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -137,39 +141,19 @@ jobs:
137141
licensei-v1-main
138142
licensei-v1
139143
140-
- name: Prepare Nix shell
141-
run: nix develop --impure .#ci
144+
- name: Make deps
145+
run: make deps
142146

143147
- name: Populate license cache
144-
run: nix develop --impure .#ci -c licensei cache
148+
run: make license-cache
145149
env:
146150
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
147151

148152
- name: Check licenses
149-
run: nix develop --impure .#ci -c make license-check
153+
run: make license-check
150154
env:
151155
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
152156

153-
dev:
154-
name: Developer environment
155-
runs-on: ubuntu-latest
156-
157-
steps:
158-
- name: Checkout repository
159-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
160-
161-
- name: Set up Nix
162-
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
163-
with:
164-
extra_nix_config: |
165-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
166-
167-
- name: Check
168-
run: nix flake check --impure
169-
170-
- name: Dev shell
171-
run: nix develop --impure
172-
173157
artifacts:
174158
name: Artifacts
175159
uses: ./.github/workflows/artifacts.yaml
@@ -207,14 +191,10 @@ jobs:
207191
- name: Checkout repository
208192
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
209193

210-
- name: Set up Nix
211-
uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # v27
194+
- name: Set up Go
195+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
212196
with:
213-
extra_nix_config: |
214-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
215-
216-
- name: Prepare Nix shell
217-
run: nix develop --impure .#ci
197+
go-version-file: '.go-version'
218198

219199
- name: Download docker image
220200
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
@@ -227,7 +207,7 @@ jobs:
227207
name: "[helm-chart] package"
228208

229209
- name: Test
230-
run: nix develop --impure .#ci -c make test-e2e
210+
run: make test-e2e
231211
env:
232212
KIND_K8S_VERSION: ${{ matrix.k8s_version }}
233213
LOAD_IMAGE_ARCHIVE: ${{ github.workspace }}/docker.tar

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
/.devenv/
2-
/.direnv/
3-
/.pre-commit-config.yaml
41
/bin/
52
/build/
63
/tmp/

.go-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.24.1

.licensei.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ignored = [
2525

2626
[header]
2727
authors = ["Cisco", "Bank-Vaults Maintainers"]
28-
ignorePaths = [".direnv", ".devenv", "vendor"]
28+
ignorePaths = ["vendor"]
2929
ignoreFiles = ["zz_generated.*.go"]
3030
template = """// Copyright © :YEAR: :AUTHOR:
3131
//

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ lint-yaml:
123123
fmt: ## Run go fmt against code
124124
$(GOLANGCI_LINT_BIN) run --fix
125125

126+
.PHONY: license-cache
127+
license-cache: ## Populate license cache
128+
$(LICENSEI_BIN) cache
129+
126130
.PHONY: license-check
127131
license-check: ## Run license check
128132
$(LICENSEI_BIN) check

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,8 @@ file](https://github.com/bank-vaults/vault-secrets-reloader/blob/main/e2e/deploy
6262

6363
## Development
6464

65-
**For an optimal developer experience, it is recommended to install [Nix](https://nixos.org/download.html) and
66-
[direnv](https://direnv.net/docs/installation.html).**
67-
68-
_Alternatively, install [Go](https://go.dev/dl/) on your computer then run `make deps` to install the rest of the
69-
dependencies._
65+
Install [Go](https://go.dev/dl/) on your computer then run `make deps` to install the rest of the
66+
dependencies.
7067

7168
Make sure Docker is installed with Compose and Buildx.
7269

0 commit comments

Comments
 (0)