Skip to content

Commit 32889e6

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 ccd14b9 commit 32889e6

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
@@ -37,13 +37,11 @@ jobs:
3737
compliance-trestle==2.4.0
3838
lxml lxml-stubs requests
3939
- name: Checkout
40-
# actions/checkout v4
41-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
4241
with:
4342
fetch-depth: 0
4443
- name: Checkout (CTF)
45-
# actions/checkout v4
46-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
44+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
4745
with:
4846
repository: ComplianceAsCode/content-test-filtering
4947
path: ctf
@@ -75,8 +73,7 @@ jobs:
7573
echo "CTF_OUTPUT_SIZE=$(stat --printf="%s"
7674
output.json)" >> $GITHUB_OUTPUT
7775
id: ctf
78-
# actions/upload-artifact v4
79-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
76+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
8077
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
8178
with:
8279
name: output.json
@@ -87,8 +84,8 @@ jobs:
8784
- name: Get product attribute
8885
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
8986
id: product
90-
# notiz-dev/github-action-json-property v0.2.0
91-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
87+
# yamllint disable-line rule:line-length
88+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
9289
with:
9390
path: 'output.json'
9491
prop_path: 'product'
@@ -106,8 +103,7 @@ jobs:
106103
- name: Build product
107104
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
108105
run: ./build_product debian12
109-
# actions/upload-artifact v4
110-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
106+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
111107
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
112108
with:
113109
name: ${{ env.DATASTREAM }}
@@ -134,11 +130,9 @@ jobs:
134130
libyaml-dev libxmlsec1-dev \
135131
libxmlsec1-openssl
136132
- name: Checkout
137-
# actions/checkout v4
138-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
133+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
139134
- name: Get cached CTF output
140-
# actions/download-artifact v4
141-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
135+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
142136
id: get_ctf_output
143137
with:
144138
name: output.json
@@ -195,40 +189,39 @@ jobs:
195189
if: >-
196190
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
197191
id: rules
198-
# notiz-dev/github-action-json-property v0.2.0
199-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
192+
# yamllint disable-line rule:line-length
193+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
200194
with:
201195
path: 'output.json'
202196
prop_path: 'rules'
203197
- name: Get product attribute
204198
if: >-
205199
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
206200
id: product
207-
# notiz-dev/github-action-json-property v0.2.0
208-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
201+
# yamllint disable-line rule:line-length
202+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
209203
with:
210204
path: 'output.json'
211205
prop_path: 'product'
212206
- name: Get bash attribute
213207
if: >-
214208
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
215209
id: bash
216-
# notiz-dev/github-action-json-property v0.2.0
217-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
210+
# yamllint disable-line rule:line-length
211+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
218212
with:
219213
path: 'output.json'
220214
prop_path: 'bash'
221215
- name: Get ansible attribute
222216
if: >-
223217
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
224218
id: ansible
225-
# notiz-dev/github-action-json-property v0.2.0
226-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
219+
# yamllint disable-line rule:line-length
220+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
227221
with:
228222
path: 'output.json'
229223
prop_path: 'ansible'
230-
# actions/download-artifact v4
231-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
224+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
232225
if: >-
233226
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
234227
with:
@@ -272,8 +265,7 @@ jobs:
272265
${{steps.bash.outputs.prop == 'True'
273266
&& steps.check_results_bash.outcome == 'success'
274267
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
275-
# actions/upload-artifact v4
276-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
268+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
277269
with:
278270
name: logs_bash
279271
path: logs_bash/
@@ -307,8 +299,7 @@ jobs:
307299
${{ steps.ansible.outputs.prop == 'True'
308300
&& steps.check_results_ansible.outcome == 'success'
309301
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
310-
# actions/upload-artifact v4
311-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
302+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
312303
with:
313304
name: logs_ansible
314305
path: logs_ansible/

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

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ jobs:
3737
compliance-trestle==2.4.0
3838
lxml lxml-stubs requests
3939
- name: Checkout
40-
# actions/checkout v4
41-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
4241
with:
4342
fetch-depth: 0
4443
- name: Checkout (CTF)
45-
# actions/checkout v4
46-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
44+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
4745
with:
4846
repository: ComplianceAsCode/content-test-filtering
4947
path: ctf
@@ -75,8 +73,7 @@ jobs:
7573
echo "CTF_OUTPUT_SIZE=$(stat --printf="%s"
7674
output.json)" >> $GITHUB_OUTPUT
7775
id: ctf
78-
# actions/upload-artifact v4
79-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
76+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
8077
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
8178
with:
8279
name: output.json
@@ -87,8 +84,8 @@ jobs:
8784
- name: Get product attribute
8885
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
8986
id: product
90-
# notiz-dev/github-action-json-property v0.2.0
91-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
87+
# yamllint disable-line rule:line-length
88+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
9289
with:
9390
path: 'output.json'
9491
prop_path: 'product'
@@ -106,8 +103,7 @@ jobs:
106103
- name: Build product
107104
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
108105
run: ./build_product ubuntu2204
109-
# actions/upload-artifact v4
110-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
106+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
111107
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
112108
with:
113109
name: ${{ env.DATASTREAM }}
@@ -134,11 +130,9 @@ jobs:
134130
libyaml-dev libxmlsec1-dev \
135131
libxmlsec1-openssl
136132
- name: Checkout
137-
# actions/checkout v4
138-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
133+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
139134
- name: Get cached CTF output
140-
# actions/download-artifact v4
141-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
135+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
142136
id: get_ctf_output
143137
with:
144138
name: output.json
@@ -195,40 +189,39 @@ jobs:
195189
if: >-
196190
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
197191
id: rules
198-
# notiz-dev/github-action-json-property v0.2.0
199-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
192+
# yamllint disable-line rule:line-length
193+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
200194
with:
201195
path: 'output.json'
202196
prop_path: 'rules'
203197
- name: Get product attribute
204198
if: >-
205199
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
206200
id: product
207-
# notiz-dev/github-action-json-property v0.2.0
208-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
201+
# yamllint disable-line rule:line-length
202+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
209203
with:
210204
path: 'output.json'
211205
prop_path: 'product'
212206
- name: Get bash attribute
213207
if: >-
214208
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
215209
id: bash
216-
# notiz-dev/github-action-json-property v0.2.0
217-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
210+
# yamllint disable-line rule:line-length
211+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
218212
with:
219213
path: 'output.json'
220214
prop_path: 'bash'
221215
- name: Get ansible attribute
222216
if: >-
223217
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
224218
id: ansible
225-
# notiz-dev/github-action-json-property v0.2.0
226-
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
219+
# yamllint disable-line rule:line-length
220+
uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8 # v0.2.0
227221
with:
228222
path: 'output.json'
229223
prop_path: 'ansible'
230-
# actions/download-artifact v4
231-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
224+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
232225
if: >-
233226
${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
234227
with:
@@ -272,8 +265,7 @@ jobs:
272265
${{steps.bash.outputs.prop == 'True'
273266
&& steps.check_results_bash.outcome == 'success'
274267
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
275-
# actions/upload-artifact v4
276-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
268+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
277269
with:
278270
name: logs_bash
279271
path: logs_bash/
@@ -307,8 +299,7 @@ jobs:
307299
${{ steps.ansible.outputs.prop == 'True'
308300
&& steps.check_results_ansible.outcome == 'success'
309301
&& steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
310-
# actions/upload-artifact v4
311-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
302+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
312303
with:
313304
name: logs_ansible
314305
path: logs_ansible/

0 commit comments

Comments
 (0)