Skip to content

Commit 63de9b9

Browse files
committed
Merge branch 'dev'
2 parents ca61f97 + 5ba988f commit 63de9b9

39 files changed

+18
-3302
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ body:
1414
options:
1515
- clamav
1616
- coraza
17-
- crowdsec
1817
- discord
1918
- slack
2019
- virustotal

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ body:
1414
options:
1515
- clamav
1616
- coraza
17-
- crowdsec
1817
- discord
1918
- slack
2019
- virustotal

.github/codeql.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: "CodeQL config"
33
paths:
44
- clamav
55
- coraza
6-
- crowdsec
76
- discord
87
- slack
98
- virustotal

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
- name: Checkout repository
2222
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
- name: Initialize CodeQL
24-
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
24+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
2525
with:
2626
languages: ${{ matrix.language }}
2727
config-file: ./.github/codeql.yml
2828
- name: Perform CodeQL Analysis
29-
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
29+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
3030
with:
3131
category: "/language:${{matrix.language}}"

.github/workflows/tests.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Get BW tag
2222
run: |
2323
if [ "$GITHUB_REF" = "refs/heads/main" ] ; then
24-
echo "BW_TAG=1.6.0-beta" >> $GITHUB_ENV
24+
echo "BW_TAG=1.6.1" >> $GITHUB_ENV
2525
else
2626
echo "BW_TAG=dev" >> $GITHUB_ENV
2727
fi
@@ -41,20 +41,11 @@ jobs:
4141
- name: Run Coraza tests
4242
run: ./.tests/coraza.sh
4343

44-
- name: Run CrowdSec live tests
45-
run: ./.tests/crowdsec.sh live
46-
47-
- name: Run CrowdSec stream tests
48-
run: ./.tests/crowdsec.sh stream
49-
50-
- name: Run CrowdSec appsec tests
51-
run: ./.tests/crowdsec.sh appsec
52-
5344
- name: Run VirusTotal tests
5445
run: ./.tests/virustotal.sh
5546
env:
5647
VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
5748

5849
- name: Build and push APIs
59-
if: env.BW_TAG == '1.5.9'
50+
if: env.BW_TAG == '1.6.1'
6051
run: ./.tests/build-push.sh "${{ env.BW_TAG }}"

.pre-commit-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ repos:
2828
rev: 84c370104d6a8d1eef00c80a3ebd42f7033aaaad # frozen: v0.20.0
2929
hooks:
3030
- id: stylua-github
31-
exclude: ^crowdsec/lib/
3231

3332
- repo: https://github.com/lunarmodules/luacheck
3433
rev: cc089e3f65acdd1ef8716cc73a3eca24a6b845e4 # frozen: v1.2.0
3534
hooks:
3635
- id: luacheck
37-
exclude: ^crowdsec/lib/
3836
args: ["--std", "min", "--codes", "--ranges", "--no-cache"]
3937

4038
- repo: https://github.com/pycqa/flake8

.tests/crowdsec.sh

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

.tests/crowdsec/acquis.yaml

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

.tests/crowdsec/appsec.yaml

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

.tests/crowdsec/docker-compose.yml

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

0 commit comments

Comments
 (0)