From cb983370a2fcfefac4731d6d06d232ee246b59b5 Mon Sep 17 00:00:00 2001 From: dylanbannon Date: Sun, 1 May 2022 15:59:41 -0700 Subject: [PATCH] git.io->cloudposse.tools update (#73) --- .github/workflows/auto-readme.yml | 22 +++++++++++++++++++--- Makefile | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-readme.yml b/.github/workflows/auto-readme.yml index 03232cd..6f25b8d 100644 --- a/.github/workflows/auto-readme.yml +++ b/.github/workflows/auto-readme.yml @@ -1,5 +1,7 @@ name: "auto-readme" on: + workflow_dispatch: + schedule: # Example of job definition: # .---------------- minute (0 - 59) @@ -15,21 +17,35 @@ on: jobs: update: - if: github.event_name == 'schedule' + if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Find default branch name + id: defaultBranch + shell: bash + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + run: | + default_branch=$(gh repo view --json defaultBranchRef --jq .defaultBranchRef.name) + printf "::set-output name=defaultBranch::%s\n" "${default_branch}" + printf "defaultBranchRef.name=%s\n" "${default_branch}" + - name: Update readme shell: bash id: update env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + DEF: "${{ steps.defaultBranch.outputs.defaultBranch }}" run: | make init make readme/build # Ignore changes if they are only whitespace - git diff --ignore-all-space --ignore-blank-lines --quiet README.md && { git restore README.md; echo Ignoring whitespace-only changes in README; } + if ! git diff --quiet README.md && git diff --ignore-all-space --ignore-blank-lines --quiet README.md; then + git restore README.md + echo Ignoring whitespace-only changes in README + fi - name: Create Pull Request # This action will not create or change a pull request if there are no changes to make. @@ -47,7 +63,7 @@ jobs: To have most recent changes of README.md and doc from origin templates branch: auto-update/readme - base: main + base: ${{ steps.defaultBranch.outputs.defaultBranch }} delete-branch: true labels: | auto-update diff --git a/Makefile b/Makefile index 97d8087..1cfc68f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SHELL := /bin/bash # List of targets the `readme` target should call before generating the readme export README_DEPS ?= docs/targets.md docs/terraform.md --include $(shell curl -sSL -o .build-harness "https://git.io/build-harness"; echo .build-harness) +-include $(shell curl -sSL -o .build-harness "https://cloudposse.tools/build-harness"; echo .build-harness) ## Lint terraform code lint: