Skip to content

Commit a34c4e1

Browse files
authored
Merge branch 'master' into yamlint_style
2 parents bf9551b + 6eeb9a0 commit a34c4e1

13 files changed

+106
-125
lines changed

.github/.container-structure-test-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ commandTests:
135135

136136
fileExistenceTests:
137137
- name: terrascan init
138-
# yamllint disable-line rule:line-length
139138
path: >-
140139
/root/.terrascan/pkg/policies/opa/rego/github/github_repository/privateRepoEnabled.rego
141140
shouldExist: true

.github/workflows/build-image-test.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838

3939
- name: Get changed Docker related files
4040
id: changed-files-specific
41-
# yamllint disable-line rule:line-length
4241
uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f # v45.0.6
4342
with:
4443
files: |
@@ -57,13 +56,11 @@ jobs:
5756
>> $GITHUB_ENV
5857
5958
- name: Set up Docker Buildx
60-
# yamllint disable-line rule:line-length
6159
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
6260
if: steps.changed-files-specific.outputs.any_changed == 'true'
6361

6462
- name: Build if Dockerfile changed
6563
if: steps.changed-files-specific.outputs.any_changed == 'true'
66-
# yamllint disable-line rule:line-length
6764
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
6865
with:
6966
context: .
@@ -103,7 +100,6 @@ jobs:
103100
104101
- name: Dive - check image for waste files
105102
if: steps.changed-files-specific.outputs.any_changed == 'true'
106-
# yamllint disable-line rule:line-length
107103
uses: MaxymVlasov/dive-action@b6a02b38f0f309e8817199658eab090d4f0f93ce # v1.1.0
108104
with:
109105
image: ${{ env.IMAGE }}
@@ -116,7 +112,6 @@ jobs:
116112
if: >-
117113
steps.changed-files-specific.outputs.any_changed == 'true'
118114
&& matrix.os == 'ubuntu-latest'
119-
# yamllint disable-line rule:line-length
120115
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
121116
with:
122117
context: .

.github/workflows/build-image.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ jobs:
2222
- name: Checkout code
2323
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- name: Set up Docker Buildx
25-
# yamllint disable-line rule:line-length
2625
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
2726
- name: Login to GitHub Container Registry
28-
# yamllint disable-line rule:line-length
2927
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
3028
with:
3129
registry: ghcr.io
@@ -45,12 +43,10 @@ jobs:
4543
run: >-
4644
echo "IMAGE_REPO=ghcr.io/${GITHUB_REPOSITORY@L}" >> $GITHUB_ENV
4745
- name: Set up Docker Buildx
48-
# yamllint disable-line rule:line-length
4946
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
5047

5148
- name: Build and Push release
5249
if: github.event_name != 'schedule'
53-
# yamllint disable-line rule:line-length
5450
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
5551
with:
5652
context: .
@@ -68,7 +64,6 @@ jobs:
6864
6965
- name: Build and Push nightly
7066
if: github.event_name == 'schedule'
71-
# yamllint disable-line rule:line-length
7267
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
7368
with:
7469
context: .

.github/workflows/ci-cd.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,10 @@ jobs:
107107

108108
steps:
109109
- name: Switch to using Python 3.13 by default
110-
# yamllint disable-line rule:line-length
111110
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
112111
with:
113112
python-version: 3.13
114113
- name: Check out src from Git
115-
# yamllint disable-line rule:line-length
116114
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
117115
with:
118116
fetch-depth: 0
@@ -165,7 +163,6 @@ jobs:
165163
echo "dir=$(python -m pip cache dir)" >> "${GITHUB_OUTPUT}"
166164
shell: bash
167165
- name: Set up pip cache
168-
# yamllint disable-line rule:line-length
169166
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
170167
with:
171168
path: ${{ steps.pip-cache-dir.outputs.dir }}
@@ -272,13 +269,11 @@ jobs:
272269

273270
steps:
274271
- name: Switch to using Python 3.13
275-
# yamllint disable-line rule:line-length
276272
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
277273
with:
278274
python-version: 3.13
279275

280276
- name: Grab the source from Git
281-
# yamllint disable-line rule:line-length
282277
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
283278
with:
284279
fetch-depth: 0
@@ -307,7 +302,6 @@ jobs:
307302
run: >-
308303
echo "dir=$(python -m pip cache dir)" >> "${GITHUB_OUTPUT}"
309304
- name: Set up pip cache
310-
# yamllint disable-line rule:line-length
311305
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
312306
with:
313307
path: ${{ steps.pip-cache-dir.outputs.dir }}
@@ -373,7 +367,6 @@ jobs:
373367
>> "${GITHUB_OUTPUT}"
374368
working-directory: dist
375369
- name: Store the distribution packages
376-
# yamllint disable-line rule:line-length
377370
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
378371
with:
379372
name: >-
@@ -520,7 +513,6 @@ jobs:
520513

521514
steps:
522515
- name: Decide whether the needed jobs succeeded or failed
523-
# yamllint disable-line rule:line-length
524516
uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
525517
with:
526518
jobs: ${{ toJSON(needs) }}

.github/workflows/codeql.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
# yamllint disable-line rule:line-length
5049
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
5150
with:
5251
languages: ${{ matrix.language }}
@@ -59,7 +58,6 @@ jobs:
5958
# If this step fails, then you should remove it and run the build
6059
# manually (see below)
6160
- name: Autobuild
62-
# yamllint disable-line rule:line-length
6361
uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
6462

6563
# ℹ️ Command-line programs to run using the OS shell.
@@ -75,7 +73,6 @@ jobs:
7573
# ./location_of_script_within_repo/buildscript.sh
7674

7775
- name: Perform CodeQL Analysis
78-
# yamllint disable-line rule:line-length
7976
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
8077
with:
8178
category: /language:${{matrix.language}}

.github/workflows/dependency-review.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout Repository
23-
# yamllint disable-line rule:line-length
2423
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2524
- name: Dependency Review
26-
# yamllint disable-line rule:line-length
2725
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

.github/workflows/pr-title.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
steps:
2424
# Please look up the latest version from
2525
# https://github.com/amannn/action-semantic-pull-request/releases
26-
# yamllint disable-line rule:line-length
2726
- uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
2827
env:
2928
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pre-commit.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
fetch-depth: 0
5454
ref: ${{ github.event.pull_request.head.sha }}
5555
# Skip terraform_tflint which interferes to commit pre-commit auto-fixes
56-
# yamllint disable-line rule:line-length
5756
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
5857
with:
5958
python-version: '3.9'

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
fetch-depth: 0
3737

3838
- name: Release
39-
# yamllint disable-line rule:line-length
4039
uses: cycjimmy/semantic-release-action@b1b432f13acb7768e0c8efdec416d363a57546f2 # v4.1.1
4140
with:
4241
semantic_version: 18.0.0

.github/workflows/reusable-tox.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ jobs:
156156
Switch to using Python v${{ inputs.python-version }}
157157
by default
158158
id: python-install
159-
# yamllint disable-line rule:line-length
160159
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
161160
with:
162161
python-version: ${{ inputs.python-version }}
@@ -167,22 +166,19 @@ jobs:
167166
- name: Grab the source from Git
168167
if: >-
169168
contains(fromJSON('["pre-commit", "spellcheck-docs"]'), inputs.toxenv)
170-
# yamllint disable-line rule:line-length
171169
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
172170
with:
173171
ref: ${{ github.event.inputs.release-committish }}
174172
- name: Retrieve the project source from an sdist inside the GHA artifact
175173
if: >-
176174
!contains(fromJSON('["pre-commit", "spellcheck-docs"]'), inputs.toxenv)
177-
# yamllint disable-line rule:line-length
178175
uses: re-actors/checkout-python-sdist@187f55296b0f54d88259aaaf99af32ad3647d3bc # v2.0.0
179176
with:
180177
source-tarball-name: ${{ inputs.source-tarball-name }}
181178
workflow-artifact-name: ${{ inputs.dists-artifact-name }}
182179

183180
- name: Cache pre-commit.com virtualenvs
184181
if: inputs.toxenv == 'pre-commit'
185-
# yamllint disable-line rule:line-length
186182
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
187183
with:
188184
path: ~/.cache/pre-commit
@@ -241,7 +237,6 @@ jobs:
241237
shell: bash
242238
- name: Set up pip cache
243239
if: fromJSON(steps.py-abi.outputs.is-stable-abi)
244-
# yamllint disable-line rule:line-length
245240
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
246241
with:
247242
path: ${{ steps.pip-cache-dir.outputs.dir }}
@@ -269,7 +264,6 @@ jobs:
269264
- name: Download all the dists
270265
if: >-
271266
contains(fromJSON('["metadata-validation", "pytest"]'), inputs.toxenv)
272-
# yamllint disable-line rule:line-length
273267
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
274268
with:
275269
name: ${{ inputs.dists-artifact-name }}
@@ -323,7 +317,6 @@ jobs:
323317
if: >-
324318
!cancelled()
325319
&& steps.tox-run.outputs.test-result-files != ''
326-
# yamllint disable-line rule:line-length
327320
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
328321
with:
329322
paths: >-
@@ -341,7 +334,6 @@ jobs:
341334
&& steps.tox-run.outputs.cov-report-files != ''
342335
&& steps.tox-run.outputs.test-result-files == ''
343336
&& steps.tox-run.outputs.codecov-flags != 'MyPy'
344-
# yamllint disable-line rule:line-length
345337
uses: irongut/CodeCoverageSummary@51cc3a756ddcd398d447c044c02cb6aa83fdae95 # v1.3.0
346338
with:
347339
badge: true
@@ -380,7 +372,6 @@ jobs:
380372
if: >-
381373
!cancelled()
382374
&& steps.tox-run.outputs.cov-report-files != ''
383-
# yamllint disable-line rule:line-length
384375
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
385376
with:
386377
disable_search: true
@@ -405,7 +396,6 @@ jobs:
405396
if: >-
406397
!cancelled()
407398
&& steps.tox-run.outputs.test-result-files != ''
408-
# yamllint disable-line rule:line-length
409399
uses: codecov/test-results-action@4e79e65778be1cecd5df25e14af1eafb6df80ea9 # v1.0.2
410400
with:
411401
disable_search: true

0 commit comments

Comments
 (0)