From 44f5b28f9328ad991ef70439d1e7b23fb7f4e1e6 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Sat, 21 Feb 2026 02:17:55 -0500 Subject: [PATCH 1/2] Change the branch used for terraform-docs Now that I have two pull requests out for changes relevant to our work it makes sense to use a branch that consolidates any changes we need. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d332c82..8f78ea1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ env: PIP_CACHE_DIR: ~/.cache/pip PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit RUN_TMATE: ${{ secrets.RUN_TMATE }} - TERRAFORM_DOCS_REPO_BRANCH_NAME: improvement/support_atx_closed_markdown_headers + TERRAFORM_DOCS_REPO_BRANCH_NAME: cisagov TERRAFORM_DOCS_REPO_DEPTH: 1 TERRAFORM_DOCS_REPO_URL: https://github.com/mcdonnnj/terraform-docs.git From 4991be50e8ffadda901217dcc6919b8487dac60c Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Mon, 23 Feb 2026 11:10:40 -0500 Subject: [PATCH 2/2] Update comment in the `build` workflow We need to update the comment about using a branch of mcdonnnj's terraform-docs fork to reflect that a second PR with different functionality is now included in the branch. Co-authored-by: Shane Frasier --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f78ea1..fddf200 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,10 +173,13 @@ jobs: PACKAGE_VERSION: ${{ steps.setup-env.outputs.staticcheck-version }} run: go install ${PACKAGE_URL}@${PACKAGE_VERSION} # TODO: https://github.com/cisagov/skeleton-generic/issues/165 - # We are temporarily using @mcdonnnj's forked branch of terraform-docs - # until his PR: https://github.com/terraform-docs/terraform-docs/pull/745 - # is approved. This temporary fix will allow for ATX header support when - # terraform-docs is run during linting. + # We are temporarily using a branch of @mcdonnnj's fork of terraform-docs that + # groups changes from his PRs until they are approved and merged: + # https://github.com/terraform-docs/terraform-docs/pull/745 + # https://github.com/terraform-docs/terraform-docs/pull/901 + # This temporary fix will allow for ATX header support when terraform-docs is run + # during linting and output delimiter rows with cell spacing that passes + # Markdownlint's MD060/table-column-style rule. - name: Clone ATX headers branch from terraform-docs fork run: | git clone \