Skip to content

Commit 027974f

Browse files
blotusblotus
committed
merge for 1.7.7 release
2 parents eacc819 + 981e616 commit 027974f

File tree

178 files changed

+5242
-2661
lines changed

Some content is hidden

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

178 files changed

+5242
-2661
lines changed

‎.github/workflows/bats-hub.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
echo githubciXXXXXXXXXXXXXXXXXXXXXXXX | sudo tee /etc/machine-id
2323
2424
- name: "Check out CrowdSec repository"
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
fetch-depth: 0
2828
submodules: true
2929

3030
- name: "Set up Go"
31-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
31+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
3232
with:
3333
go-version-file: go.mod
3434

‎.github/workflows/bats-mysql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
echo githubciXXXXXXXXXXXXXXXXXXXXXXXX | sudo tee /etc/machine-id
2929
3030
- name: "Check out CrowdSec repository"
31-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
with:
3333
fetch-depth: 0
3434
submodules: true
3535

3636
- name: "Set up Go"
37-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
37+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
3838
with:
3939
go-version-file: go.mod
4040

‎.github/workflows/bats-postgres.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
echo githubciXXXXXXXXXXXXXXXXXXXXXXXX | sudo tee /etc/machine-id
3838
3939
- name: "Check out CrowdSec repository"
40-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4141
with:
4242
fetch-depth: 0
4343
submodules: true
4444

4545
- name: "Set up Go"
46-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
46+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
4747
with:
4848
go-version-file: go.mod
4949

‎.github/workflows/bats-sqlite-coverage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
echo githubciXXXXXXXXXXXXXXXXXXXXXXXX | sudo tee /etc/machine-id
2424
2525
- name: "Check out CrowdSec repository"
26-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727
with:
2828
fetch-depth: 0
2929
submodules: true
3030

3131
- name: "Set up Go"
32-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
32+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
3333
with:
3434
go-version-file: go.mod
3535

‎.github/workflows/cache-cleanup.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
14-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515

1616
- name: Cleanup
1717
run: |

‎.github/workflows/ci-windows-build-msi.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ jobs:
2727
steps:
2828

2929
- name: Check out code into the Go module directory
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
fetch-depth: 0
3333
submodules: false
3434

3535
- name: "Set up Go"
36-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
36+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
3737
with:
3838
go-version-file: go.mod
3939

4040
- name: Build
4141
run: make windows_installer BUILD_RE2_WASM=1
4242
- name: Upload MSI
43-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
43+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
4444
with:
4545
path: crowdsec*msi
4646
name: crowdsec.msi

‎.github/workflows/ci_release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
# Drafts your next Release notes as Pull Requests are merged into "master"
22-
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
22+
- uses: release-drafter/release-drafter@6a93d829887aa2e0748befe2e808c66c0ec6e4c7 # v6.4.0
2323
with:
2424
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
2525
config-name: release-drafter.yml

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
47+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4848
with:
4949
# required to pick up tags for BUILD_VERSION
5050
fetch-depth: 0
5151

5252
- name: "Set up Go"
53-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
53+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
5454
with:
5555
go-version-file: go.mod
5656
cache-dependency-path: "**/go.sum"
5757

5858
# Initializes the CodeQL tools for scanning.
5959
- name: Initialize CodeQL
60-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
60+
uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
6161
with:
6262
languages: ${{ matrix.language }}
6363
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,4 +81,4 @@ jobs:
8181
make clean build BUILD_RE2_WASM=1
8282
8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
84+
uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0

‎.github/workflows/docker-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ jobs:
2929
timeout-minutes: 20
3030
steps:
3131
- name: Check out the repo
32-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Set up Docker Buildx
37-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
37+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3838
with:
3939
buildkitd-config: .github/buildkit.toml
4040

4141
- name: "Build image"
42-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
42+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
4343
with:
4444
context: .
4545
file: ./build/docker/Dockerfile${{ matrix.flavor == 'debian' && '.debian' || '' }}
@@ -54,14 +54,14 @@ jobs:
5454
run: docker network create net-test
5555

5656
- name: Install uv
57-
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
57+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
5858
with:
5959
version: 0.5.24
6060
enable-cache: true
6161
working-directory: "./build/docker/test"
6262

6363
- name: "Set up Python"
64-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
64+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
6565
with:
6666
python-version-file: "./build/docker/test/.python-version"
6767

‎.github/workflows/go-tests-windows.yml‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,58 +6,57 @@ on:
66
- master
77
- releases/**
88
paths-ignore:
9-
- 'README.md'
9+
- "README.md"
1010
pull_request:
1111
branches:
1212
- master
1313
- releases/**
1414
paths-ignore:
15-
- 'README.md'
15+
- "README.md"
1616

1717
env:
1818
CROWDSEC_FEATURE_DISABLE_HTTP_RETRY_BACKOFF: true
1919

2020
jobs:
2121
build:
2222
name: "Build + tests"
23-
runs-on: windows-2022
23+
runs-on: windows-2025
2424

2525
steps:
26-
27-
- name: Check out CrowdSec repository
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
29-
with:
30-
fetch-depth: 0
31-
submodules: false
32-
33-
- name: "Set up Go"
34-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
35-
with:
36-
go-version-file: go.mod
37-
38-
- name: Build
39-
run: |
40-
make build BUILD_RE2_WASM=1
41-
42-
- name: Generate codecov configuration
43-
run: |
26+
- name: Check out CrowdSec repository
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
with:
29+
fetch-depth: 0
30+
submodules: false
31+
32+
- name: "Set up Go"
33+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
34+
with:
35+
go-version-file: go.mod
36+
37+
- name: Build
38+
run: |
39+
make build BUILD_RE2_WASM=1
40+
41+
- name: Generate codecov configuration
42+
run: |
4443
.github/generate-codecov-yml.sh >> .github/codecov.yml
4544
46-
- name: Unit tests
47-
run: |
48-
go install gotest.tools/gotestsum@v1.12.3
49-
make testcover
50-
51-
- name: Upload unit coverage to Codecov
52-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
53-
with:
54-
files: coverage.out
55-
flags: unit-windows
56-
token: ${{ secrets.CODECOV_TOKEN }}
57-
58-
- name: golangci-lint
59-
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
60-
with:
61-
version: v2.8
62-
args: --issues-exit-code=1 --timeout 10m
63-
only-new-issues: false
45+
- name: Unit tests
46+
run: |
47+
go install gotest.tools/gotestsum@v1.12.3
48+
make testcover
49+
50+
- name: Upload unit coverage to Codecov
51+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
52+
with:
53+
files: coverage.out
54+
flags: unit-windows
55+
token: ${{ secrets.CODECOV_TOKEN }}
56+
57+
- name: golangci-lint
58+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
59+
with:
60+
version: v2.10
61+
args: --issues-exit-code=1 --timeout 10m
62+
only-new-issues: false

0 commit comments

Comments
 (0)