Skip to content

Commit 729e98b

Browse files
authored
Correct syntax issues
The automated tool that produced these PRs broke lines in the wrong place in a couple of cases. Also, the resulting PR didn't pass CI because our CI runs shellcheck, and the PR had some problems with variable quoting.
1 parent a4fb012 commit 729e98b

1 file changed

Lines changed: 36 additions & 35 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ jobs:
118118
docker: ${{steps.filter.outputs.docker || steps.filter.outputs.ci}}
119119
docker_files: ${{steps.filter.outputs.docker_files}}
120120

121-
requirements: ${{steps.filter.outputs.requirements || steps.filter.outputs.ci}}
122-
requirements_files: ${{steps.filter.outputs.requirements_files}}
123-
124121
shell: ${{steps.filter.outputs.shell || steps.filter.outputs.ci}}
125122
shell_files: ${{steps.filter.outputs.shell_files}}
126123
steps:
@@ -133,7 +130,7 @@ jobs:
133130
run: |
134131
set -x +e
135132
url="repos/${{github.repository}}/commits/${INPUTS_SHA}"
136-
if full_sha="$(gh api $url -q '.sha')"; then
133+
if full_sha="$(gh api "$url" -q '.sha')"; then
137134
echo "base=$full_sha" >> "$GITHUB_ENV"
138135
else
139136
{
@@ -147,7 +144,7 @@ jobs:
147144
- if: github.event_name != 'workflow_dispatch'
148145
name: Use ref ${{github.ref_name}} as the basis for comparison
149146
run: |
150-
echo base=${GITHUB_REF_NAME} >> "$GITHUB_ENV"
147+
echo base="${GITHUB_REF_NAME}" >> "$GITHUB_ENV"
151148
152149
- name: Check out a copy of the OpenFermion git repository
153150
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -170,6 +167,12 @@ jobs:
170167
- '**/CITATION.cff'
171168
python:
172169
- '**/*.py'
170+
- 'dev_tools/conf/**'
171+
- 'dev_tools/requirements/deps/*.txt'
172+
- 'dev_tools/requirements/env/*.txt'
173+
- 'dev_tools/requirements/max_compat/*.txt'
174+
- 'docs/**/*-requirements.txt'
175+
- 'docs/**/requirements.txt'
173176
gha:
174177
- added|modified:
175178
- './.github/workflows/*.yaml'
@@ -184,10 +187,6 @@ jobs:
184187
docker:
185188
- '**/dockerfile'
186189
- '**/Dockerfile'
187-
requirements:
188-
- 'dev_tools/requirements/deps/*.txt'
189-
- 'docs/**/*-requirements.txt'
190-
- 'docs/**/requirements.txt'
191190
shell:
192191
- '**/*.sh'
193192
- 'check/*'
@@ -203,7 +202,7 @@ jobs:
203202
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
204203

205204
- name: Set up Python with caching of pip dependencies
206-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
205+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
207206
with:
208207
python-version: ${{inputs.python_ver || env.python_ver}}
209208
architecture: 'x64'
@@ -234,7 +233,7 @@ jobs:
234233
fetch-depth: 0
235234

236235
- name: Set up Python and restore cache
237-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
236+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
238237
with:
239238
python-version: ${{inputs.python_ver || env.python_ver}}
240239
architecture: 'x64'
@@ -261,7 +260,7 @@ jobs:
261260
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
262261

263262
- name: Set up Python and restore cache
264-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
263+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
265264
with:
266265
python-version: ${{inputs.python_ver || env.python_ver}}
267266
architecture: 'x64'
@@ -288,7 +287,7 @@ jobs:
288287
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
289288

290289
- name: Set up Python and restore cache
291-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
290+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
292291
with:
293292
python-version: ${{inputs.python_ver || env.python_ver}}
294293
architecture: 'x64'
@@ -328,7 +327,7 @@ jobs:
328327
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
329328

330329
- name: Set up Python and restore cache
331-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
330+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
332331
with:
333332
python-version: ${{inputs.python_ver || env.python_ver}}
334333
cache: pip
@@ -357,7 +356,8 @@ jobs:
357356
exit 0
358357
else
359358
exit 1
360-
fi env:
359+
fi
360+
env:
361361
NEEDS_PYTEST_MATRIX_RESULT: ${{needs.pytest-matrix.result}}
362362
363363
pytest-extra-matrix:
@@ -376,7 +376,7 @@ jobs:
376376
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
377377

378378
- name: Set up Python and restore cache
379-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
379+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
380380
with:
381381
python-version: ${{inputs.python_ver || env.python_ver}}
382382
cache: pip
@@ -405,8 +405,9 @@ jobs:
405405
exit 0
406406
else
407407
exit 1
408-
fi env:
409-
NEEDS_PYTEST_EXTRA_MATRIX_RESULT: ${{needs.pytest-extra-matrix.result}}
408+
fi
409+
env:
410+
NEEDS_PYTEST_MATRIX_RESULT: ${{needs.pytest-extra-matrix.result}}
410411
411412
python-compat:
412413
if: needs.changes.outputs.python == 'true'
@@ -421,7 +422,7 @@ jobs:
421422
# Note: deliberately not using our Python cache here b/c this runs
422423
# a different version of Python.
423424
- name: Set up Python and restore cache
424-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
425+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
425426
with:
426427
python-version: ${{env.python_compat_ver}}
427428

@@ -447,7 +448,7 @@ jobs:
447448
fetch-depth: 0
448449

449450
- name: Set up Python and restore cache
450-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
451+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
451452
with:
452453
python-version: ${{inputs.python_ver || env.python_ver}}
453454
cache: pip
@@ -469,7 +470,7 @@ jobs:
469470
runs-on: ubuntu-24.04
470471
timeout-minutes: 5
471472
env:
472-
changed_files: ${{needs.changes.outputs.yaml_files}}
473+
CHANGED_FILES: ${{needs.changes.outputs.yaml_files}}
473474
steps:
474475
- name: Check out a copy of the git repository
475476
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -480,8 +481,7 @@ jobs:
480481
- name: Run yamllint
481482
run: |
482483
set -x
483-
# shellcheck disable=SC2086
484-
yamllint $changed_files
484+
yamllint "${CHANGED_FILES}"
485485
486486
json-lint:
487487
if: needs.changes.outputs.json == 'true'
@@ -490,7 +490,7 @@ jobs:
490490
runs-on: ubuntu-24.04
491491
timeout-minutes: 5
492492
env:
493-
changed_files: ${{needs.changes.outputs.json_files}}
493+
CHANGED_FILES: ${{needs.changes.outputs.json_files}}
494494
steps:
495495
- name: Check out a copy of the git repository
496496
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -502,16 +502,14 @@ jobs:
502502
run: echo '::add-matcher::.github/problem-matchers/jsonlint.json'
503503

504504
- name: Run jsonlint on JSON files
505-
run: jsonlint --continue ${CHANGED_FILES}
505+
run: jsonlint --continue "${CHANGED_FILES}"
506506

507507
cff-validation:
508508
if: needs.changes.outputs.cff == 'true'
509509
name: CITATION.cff checks
510510
needs: changes
511511
runs-on: ubuntu-24.04
512512
timeout-minutes: 5
513-
env:
514-
changed_files: ${{needs.changes.outputs.cff_files}}
515513
steps:
516514
- name: Check out a copy of the git repository
517515
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -530,7 +528,7 @@ jobs:
530528
runs-on: macos-14
531529
timeout-minutes: 5
532530
env:
533-
changed_files: ${{needs.changes.outputs.docker_files}}
531+
CHANGED_FILES: ${{needs.changes.outputs.docker_files}}
534532
steps:
535533
- name: Check out a copy of the git repository
536534
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -544,7 +542,9 @@ jobs:
544542
run: echo '::add-matcher::.github/problem-matchers/hadolint.json'
545543

546544
- name: Run hadolint on Dockerfiles that have been changed
547-
run: hadolint ${CHANGED_FILES}
545+
run: |
546+
# shellcheck disable=SC2086
547+
hadolint ${CHANGED_FILES}
548548
549549
workflow-validation:
550550
if: needs.changes.outputs.gha == 'true'
@@ -553,15 +553,14 @@ jobs:
553553
# This uses a Mac runner because actionlint isn't available via Linux apt.
554554
runs-on: macos-14
555555
timeout-minutes: 5
556-
env:
557-
changed_files: ${{needs.changes.outputs.gha_files}}
558556
steps:
559557
- name: Check out a copy of the git repository
560558
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
561559

562560
# The next action simply fails if there are any unpinned actions.
563561
- name: Verify that all workflow actions have pinned versions
564-
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@9e9574ef04ea69da568d6249bd69539ccc704e74
562+
# yamllint disable-line rule:line-length
563+
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@d5d20e15f2736816ee0e001ba8b24b54d9ffcff4 # v5.0.0
565564

566565
# If we didn't fail the previous check, go on to more time-consuming ones.
567566
- name: Install actionlint
@@ -580,7 +579,7 @@ jobs:
580579
runs-on: ubuntu-24.04
581580
timeout-minutes: 5
582581
env:
583-
changed_files: ${{needs.changes.outputs.shell_files}}
582+
CHANGED_FILES: ${{needs.changes.outputs.shell_files}}
584583
steps:
585584
- name: Check out a copy of the git repository
586585
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -589,7 +588,9 @@ jobs:
589588
run: echo "::add-matcher::.github/problem-matchers/shellcheck.json"
590589

591590
- name: Run shellcheck on shell scripts that have been changed
592-
run: shellcheck ${CHANGED_FILES}
591+
run: |
592+
# shellcheck disable=SC2086
593+
shellcheck ${CHANGED_FILES}
593594
594595
print-debugging-info:
595596
if: failure()
@@ -601,7 +602,7 @@ jobs:
601602
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
602603

603604
- name: Set up Python with caching of pip dependencies
604-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
605+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
605606
with:
606607
python-version: ${{inputs.python_ver || env.python_ver}}
607608
architecture: 'x64'

0 commit comments

Comments
 (0)