From b5e957a567c5a9a84920be3cdba3fe86cbaf5198 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 14 Sep 2024 15:12:16 -0500 Subject: [PATCH] lint actionlint: enable shellcheck integration --- .github/workflows/build-package-docs.yaml | 16 +++++++++------- .github/workflows/reusable-pip-compile.yml | 2 ++ noxfile.py | 2 -- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-package-docs.yaml b/.github/workflows/build-package-docs.yaml index 93882a5e19b..5d95397fe78 100644 --- a/.github/workflows/build-package-docs.yaml +++ b/.github/workflows/build-package-docs.yaml @@ -80,7 +80,7 @@ jobs: - name: Set the COLLECTION_LIST variable if: env.PACKAGE_VERSION != 'devel' run: >- - echo COLLECTION_LIST='"${PACKAGE_VERSION}"' + echo COLLECTION_LIST="${PACKAGE_VERSION}" >> "${GITHUB_ENV}" - name: Set the VERSION variable @@ -93,7 +93,7 @@ jobs: - name: Create a tarball with the build contents run: >- tar -czvf - ansible-package-docs-html-"${PACKAGE_VERSION}"-$(date '+%Y-%m-%d')-${{ + ansible-package-docs-html-"${PACKAGE_VERSION}"-"$(date '+%Y-%m-%d')"-${{ github.run_id }}-${{ github.run_number @@ -117,11 +117,13 @@ jobs: steps: - name: Log the workflow inputs if deployed run: | - echo "## Deployment details :shipit:" >> "${GITHUB_STEP_SUMMARY}" - echo "Publish to: ${{ github.event.inputs.deployment-environment }}" >> "${GITHUB_STEP_SUMMARY}" - echo "Package version: ${{ github.event.inputs.ansible-package-version }}" >> "${GITHUB_STEP_SUMMARY}" - echo "Owner: ${{ github.event.inputs.repository-owner }}" >> "${GITHUB_STEP_SUMMARY}" - echo "Branch: ${{ github.event.inputs.repository-branch }}" >> "${GITHUB_STEP_SUMMARY}" + { + echo "## Deployment details :shipit:"; + echo "Publish to: ${{ github.event.inputs.deployment-environment }}"; + echo "Package version: ${{ github.event.inputs.ansible-package-version }}"; + echo "Owner: ${{ github.event.inputs.repository-owner }}"; + echo "Branch: ${{ github.event.inputs.repository-branch }}"; + } >> "${GITHUB_STEP_SUMMARY}" notify-build-failures: if: failure() diff --git a/.github/workflows/reusable-pip-compile.yml b/.github/workflows/reusable-pip-compile.yml index b96bd0353a0..5fcb9db3915 100644 --- a/.github/workflows/reusable-pip-compile.yml +++ b/.github/workflows/reusable-pip-compile.yml @@ -94,7 +94,9 @@ jobs: run: | set -x git diff || : + # shellcheck disable=SC2086 git add ${changed_files} + # shellcheck disable=SC2086 if git diff-index --quiet HEAD ${changed_files}; then echo "Nothing to do!" exit diff --git a/noxfile.py b/noxfile.py index 5961a5b132a..395d3aaf101 100644 --- a/noxfile.py +++ b/noxfile.py @@ -134,8 +134,6 @@ def actionlint(session: nox.Session) -> None: "--workdir", "/pwd", # fmt: on ACTIONLINT_IMAGE, - # Disable shellcheck for now - "-shellcheck=", *session.posargs, external=True, )