Skip to content

Commit 5aeb4e9

Browse files
authored
ci: update deps (#820)
Update some of the CI dependencies, remove `review_secrets` job and remove `dependabot.yml` config as well.
1 parent 9abcdf3 commit 5aeb4e9

File tree

78 files changed

+175
-205
lines changed

Some content is hidden

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

78 files changed

+175
-205
lines changed

.github/dependabot.yml

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

.github/workflows/build-test-release.yml

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
outputs:
2020
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- id: matrix
2424
uses: splunk/addonfactory-test-matrix-action@v1
2525

2626
fossa-scan:
2727
continue-on-error: true
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- name: run fossa anlyze and create report
3232
run: |
3333
curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
@@ -36,7 +36,7 @@ jobs:
3636
env:
3737
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
3838
- name: upload THIRDPARTY file
39-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: THIRDPARTY
4242
path: /tmp/THIRDPARTY
@@ -49,47 +49,32 @@ jobs:
4949
compliance-copyrights:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v3
53-
- uses: apache/skywalking-eyes@v0.4.0
52+
- uses: actions/checkout@v4
53+
- uses: apache/skywalking-eyes@v0.6.0
5454

5555
pre-commit:
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v3
59-
- uses: actions/setup-python@v4
58+
- uses: actions/checkout@v4
59+
- uses: actions/setup-python@v5
6060
with:
6161
python-version: "3.7"
62-
- uses: pre-commit/action@v3.0.0
62+
- uses: pre-commit/action@v3.0.1
6363

6464
semgrep:
6565
runs-on: ubuntu-latest
6666
name: security-sast-semgrep
67-
if: github.actor != 'dependabot[bot]'
6867
steps:
69-
- uses: actions/checkout@v3
68+
- uses: actions/checkout@v4
7069
- id: semgrep
7170
uses: semgrep/semgrep-action@v1
7271
with:
7372
publishToken: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}
7473

75-
review_secrets:
76-
name: security-detect-secrets
77-
runs-on: ubuntu-latest
78-
steps:
79-
- name: Checkout
80-
uses: actions/checkout@v3
81-
with:
82-
submodules: false
83-
fetch-depth: "0"
84-
- name: Trufflehog Actions Scan
85-
uses: edplato/trufflehog-actions-scan@v0.9j-beta
86-
with:
87-
scanArguments: "--max_dept 50 -x .github/workflows/exclude-patterns.txt"
88-
8974
test-splunk-unit:
9075
runs-on: ubuntu-latest
9176
steps:
92-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
9378
with:
9479
submodules: true
9580
- name: Install dependencies
@@ -102,10 +87,10 @@ jobs:
10287
name: Test Docs
10388
runs-on: ubuntu-latest
10489
steps:
105-
- uses: actions/checkout@v3
90+
- uses: actions/checkout@v4
10691
with:
10792
submodules: true
108-
- uses: actions/setup-python@v4
93+
- uses: actions/setup-python@v5
10994
with:
11095
python-version: 3.7
11196
- name: Install and run tests
@@ -123,13 +108,12 @@ jobs:
123108
- compliance-copyrights
124109
- test-splunk-doc
125110
- test-splunk-unit
126-
- review_secrets
127111
strategy:
128112
fail-fast: false
129113
matrix:
130114
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
131115
steps:
132-
- uses: actions/checkout@v3
116+
- uses: actions/checkout@v4
133117
with:
134118
submodules: true
135119
- name: Setup for testing
@@ -156,13 +140,13 @@ jobs:
156140
docker container create --name dummy \
157141
-v pytest-splunk-addon_results:/work/test-results \
158142
registry.access.redhat.com/ubi7/ubi
159-
docker cp dummy:/work/test-results/test.xml test-results-${{ matrix.splunk-version }}
160-
- uses: actions/upload-artifact@v3
143+
docker cp dummy:/work/test-results/test.xml test-results-${{ matrix.splunk.version }}
144+
- uses: actions/upload-artifact@v4
161145
if: always()
162146
with:
163-
name: splunk ${{ matrix.splunk-version }} external test artifacts
147+
name: splunk ${{ matrix.splunk.version }} external test artifacts
164148
path: |
165-
test-results-${{ matrix.splunk-version }}
149+
test-results-${{ matrix.splunk.version }}
166150
167151
test-splunk-matrix:
168152
needs:
@@ -172,7 +156,6 @@ jobs:
172156
- compliance-copyrights
173157
- test-splunk-doc
174158
- test-splunk-unit
175-
- review_secrets
176159
runs-on: ubuntu-latest
177160
strategy:
178161
fail-fast: false
@@ -192,10 +175,10 @@ jobs:
192175
"splunk_app_req_broken",
193176
]
194177
steps:
195-
- uses: actions/checkout@v3
178+
- uses: actions/checkout@v4
196179
with:
197180
submodules: true
198-
- uses: actions/setup-python@v4
181+
- uses: actions/setup-python@v5
199182
with:
200183
python-version: 3.7
201184
- run: |
@@ -209,16 +192,16 @@ jobs:
209192
- test-splunk-matrix
210193
runs-on: ubuntu-latest
211194
steps:
212-
- uses: actions/checkout@v3
195+
- uses: actions/checkout@v4
213196
with:
214197
# Very Important semantic-release won't trigger a tagged
215198
# build if this is not set false
216199
submodules: false
217200
persist-credentials: false
218-
- uses: actions/setup-python@v4
201+
- uses: actions/setup-python@v5
219202
with:
220203
python-version: "3.7"
221-
- uses: actions/download-artifact@v3
204+
- uses: actions/download-artifact@v4
222205
with:
223206
name: THIRDPARTY
224207
- name: Update Notices

.github/workflows/exclude-patterns.txt

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

.licenserc.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,5 +37,4 @@ header:
3737
- "renovate.json"
3838
- "pytest_splunk_addon/.ignore_splunk_internal_errors"
3939
- "pytest_splunk_addon/docker_class.py"
40-
41-
comment: on-failure
40+
- "requirements.txt"

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

.releaserc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

Dockerfile.splunk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

Dockerfile.tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

Dockerfile.uf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

docker-compose-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2021 Splunk Inc.
2+
# Copyright 2024 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)