Skip to content

Commit faf30c9

Browse files
marcusburghardtmarcusburghardt
committed
fix: restore inline version comments on uses: lines
Restore the original inline '# vX.Y.Z' comment style on all uses: lines to match the convention used across other workflow files. For notiz-dev/github-action-json-property lines that exceed 99 characters with inline comments, add yamllint disable-line directives instead of moving the comment to a separate line. Addresses PR #14744 review feedback from @Mab879. Assisted-by: OpenCode (claude-opus-4-6) Signed-off-by: Marcus Burghardt <maburgha@redhat.com>
1 parent e16e612 commit faf30c9

2 files changed

Lines changed: 38 additions & 56 deletions

File tree

‎.github/workflows/automatus-debian12.yaml‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
- name: Install deps python
3535
run: pip3 install gitpython xmldiff lxml lxml-stubs requests
3636
- name: Checkout
37-
# actions/checkout v4
38-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
3938
with:
4039
fetch-depth: 0
4140
- name: Checkout (CTF)
42-
# actions/checkout v4
43-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
4442
with:
4543
repository: ComplianceAsCode/content-test-filtering
4644
path: ctf
@@ -72,8 +70,7 @@ jobs:
7270
echo "CTF_OUTPUT_SIZE=$(stat --printf="%s"
7371
output.json)" >> $GITHUB_OUTPUT
7472
id: ctf
75-
# actions/upload-artifact v4
76-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
73+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
7774
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
7875
with:
7976
name: output.json
@@ -84,8 +81,8 @@ jobs:
8481
- name: Get product attribute
8582
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
8683
id: product
87-
# notiz-dev/github-action-json-property v0.2.0
88-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
84+
# yamllint disable-line rule:line-length
85+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
8986
with:
9087
path: 'output.json'
9188
prop_path: 'product'
@@ -103,8 +100,7 @@ jobs:
103100
- name: Build product
104101
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
105102
run: ./build_product debian12
106-
# actions/upload-artifact v4
107-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
103+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
108104
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
109105
with:
110106
name: ${{ env.DATASTREAM }}
@@ -131,11 +127,9 @@ jobs:
131127
libyaml-dev libxmlsec1-dev \
132128
libxmlsec1-openssl
133129
- name: Checkout
134-
# actions/checkout v4
135-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
130+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
136131
- name: Get cached CTF output
137-
# actions/download-artifact v4
138-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
132+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
139133
id: get_ctf_output
140134
with:
141135
name: output.json
@@ -192,40 +186,39 @@ jobs:
192186
if: >-
193187
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
194188
id: rules
195-
# notiz-dev/github-action-json-property v0.2.0
196-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
189+
# yamllint disable-line rule:line-length
190+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
197191
with:
198192
path: 'output.json'
199193
prop_path: 'rules'
200194
- name: Get product attribute
201195
if: >-
202196
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
203197
id: product
204-
# notiz-dev/github-action-json-property v0.2.0
205-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
198+
# yamllint disable-line rule:line-length
199+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
206200
with:
207201
path: 'output.json'
208202
prop_path: 'product'
209203
- name: Get bash attribute
210204
if: >-
211205
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
212206
id: bash
213-
# notiz-dev/github-action-json-property v0.2.0
214-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
207+
# yamllint disable-line rule:line-length
208+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
215209
with:
216210
path: 'output.json'
217211
prop_path: 'bash'
218212
- name: Get ansible attribute
219213
if: >-
220214
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
221215
id: ansible
222-
# notiz-dev/github-action-json-property v0.2.0
223-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
216+
# yamllint disable-line rule:line-length
217+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
224218
with:
225219
path: 'output.json'
226220
prop_path: 'ansible'
227-
# actions/download-artifact v4
228-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
221+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
229222
if: >-
230223
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
231224
with:
@@ -269,8 +262,7 @@ jobs:
269262
${{steps.bash.outputs.prop == 'True'
270263
&& steps.check_results_bash.outcome == 'success'
271264
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
272-
# actions/upload-artifact v4
273-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
265+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
274266
with:
275267
name: logs_bash
276268
path: logs_bash/
@@ -304,8 +296,7 @@ jobs:
304296
${{ steps.ansible.outputs.prop == 'True'
305297
&& steps.check_results_ansible.outcome == 'success'
306298
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
307-
# actions/upload-artifact v4
308-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
299+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
309300
with:
310301
name: logs_ansible
311302
path: logs_ansible/

‎.github/workflows/automatus-ubuntu2204.yaml‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
- name: Install deps python
3535
run: pip3 install gitpython xmldiff lxml lxml-stubs requests
3636
- name: Checkout
37-
# actions/checkout v4
38-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
3938
with:
4039
fetch-depth: 0
4140
- name: Checkout (CTF)
42-
# actions/checkout v4
43-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
4442
with:
4543
repository: ComplianceAsCode/content-test-filtering
4644
path: ctf
@@ -72,8 +70,7 @@ jobs:
7270
echo "CTF_OUTPUT_SIZE=$(stat --printf="%s"
7371
output.json)" >> $GITHUB_OUTPUT
7472
id: ctf
75-
# actions/upload-artifact v4
76-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
73+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
7774
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
7875
with:
7976
name: output.json
@@ -84,8 +81,8 @@ jobs:
8481
- name: Get product attribute
8582
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
8683
id: product
87-
# notiz-dev/github-action-json-property v0.2.0
88-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
84+
# yamllint disable-line rule:line-length
85+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
8986
with:
9087
path: 'output.json'
9188
prop_path: 'product'
@@ -103,8 +100,7 @@ jobs:
103100
- name: Build product
104101
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
105102
run: ./build_product ubuntu2204
106-
# actions/upload-artifact v4
107-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
103+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
108104
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
109105
with:
110106
name: ${{ env.DATASTREAM }}
@@ -131,11 +127,9 @@ jobs:
131127
libyaml-dev libxmlsec1-dev \
132128
libxmlsec1-openssl
133129
- name: Checkout
134-
# actions/checkout v4
135-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
130+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
136131
- name: Get cached CTF output
137-
# actions/download-artifact v4
138-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
132+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
139133
id: get_ctf_output
140134
with:
141135
name: output.json
@@ -192,40 +186,39 @@ jobs:
192186
if: >-
193187
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
194188
id: rules
195-
# notiz-dev/github-action-json-property v0.2.0
196-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
189+
# yamllint disable-line rule:line-length
190+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
197191
with:
198192
path: 'output.json'
199193
prop_path: 'rules'
200194
- name: Get product attribute
201195
if: >-
202196
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
203197
id: product
204-
# notiz-dev/github-action-json-property v0.2.0
205-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
198+
# yamllint disable-line rule:line-length
199+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
206200
with:
207201
path: 'output.json'
208202
prop_path: 'product'
209203
- name: Get bash attribute
210204
if: >-
211205
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
212206
id: bash
213-
# notiz-dev/github-action-json-property v0.2.0
214-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
207+
# yamllint disable-line rule:line-length
208+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
215209
with:
216210
path: 'output.json'
217211
prop_path: 'bash'
218212
- name: Get ansible attribute
219213
if: >-
220214
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
221215
id: ansible
222-
# notiz-dev/github-action-json-property v0.2.0
223-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
216+
# yamllint disable-line rule:line-length
217+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
224218
with:
225219
path: 'output.json'
226220
prop_path: 'ansible'
227-
# actions/download-artifact v4
228-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
221+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
229222
if: >-
230223
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
231224
with:
@@ -269,8 +262,7 @@ jobs:
269262
${{steps.bash.outputs.prop == 'True'
270263
&& steps.check_results_bash.outcome == 'success'
271264
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
272-
# actions/upload-artifact v4
273-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
265+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
274266
with:
275267
name: logs_bash
276268
path: logs_bash/
@@ -304,8 +296,7 @@ jobs:
304296
${{ steps.ansible.outputs.prop == 'True'
305297
&& steps.check_results_ansible.outcome == 'success'
306298
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
307-
# actions/upload-artifact v4
308-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
299+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
309300
with:
310301
name: logs_ansible
311302
path: logs_ansible/

0 commit comments

Comments
 (0)