Skip to content

Commit

Permalink
Merge pull request #87 from terraform-docs/update-deps
Browse files Browse the repository at this point in the history
Update dependancies
  • Loading branch information
khos2ow authored Jul 7, 2022
2 parents 561fc05 + 088f74c commit fefba94
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 24 deletions.
8 changes: 4 additions & 4 deletions .github/templates/README.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: {{"${{"}} github.event.pull_request.head.ref {{"}}"}}

Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
To enable you need to ensure a few things first:

- set `git-push` to `true`
- use `actions/checkout@v2` with the head ref for PRs or branch name for pushes
- use `actions/checkout@v3` with the head ref for PRs or branch name for pushes
- PR

```yaml
Expand All @@ -109,7 +109,7 @@ To enable you need to ensure a few things first:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: {{"${{"}} github.event.pull_request.head.ref {{"}}"}}
```
Expand All @@ -125,7 +125,7 @@ To enable you need to ensure a few things first:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: master
```
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
Expand Down Expand Up @@ -105,14 +105,11 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Terraform format
uses: hashicorp/terraform-github-actions@master
uses: hashicorp/setup-terraform@v2
with:
tf_actions_working_dir: examples
tf_actions_version: '0.12.17'
tf_actions_subcommand: 'fmt'
tf_actions_comment: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
terraform_version: '0.12.17'

- run: terraform fmt examples
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Login to Docker
uses: docker/login-action@v1
uses: docker/login-action@v2
if: env.REGISTRY_USERNAME != ''
with:
registry: quay.io
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Login to Docker
uses: docker/login-action@v1
uses: docker/login-action@v2
if: env.REGISTRY_USERNAME != ''
with:
registry: quay.io
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- run: |
VERSION=$(echo ${{ github.event.release.tag_name }} | cut -d. -f1)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
Expand All @@ -25,7 +25,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install gomplate
run: |
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}

Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
To enable you need to ensure a few things first:

- set `git-push` to `true`
- use `actions/checkout@v2` with the head ref for PRs or branch name for pushes
- use `actions/checkout@v3` with the head ref for PRs or branch name for pushes
- PR

```yaml
Expand All @@ -114,7 +114,7 @@ To enable you need to ensure a few things first:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
```
Expand All @@ -130,7 +130,7 @@ To enable you need to ensure a few things first:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: master
```
Expand Down
1 change: 1 addition & 0 deletions src/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ if [ -z "${INPUT_GIT_PUSH_USER_EMAIL}" ]; then
fi

git_setup() {
git config --global --add safe.directory /github/workspace
git config --global user.name "${INPUT_GIT_PUSH_USER_NAME}"
git config --global user.email "${INPUT_GIT_PUSH_USER_EMAIL}"
git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true
Expand Down

0 comments on commit fefba94

Please sign in to comment.