Skip to content

Commit

Permalink
Merge pull request #17 from pbs/updates_from_template
Browse files Browse the repository at this point in the history
updates from template
  • Loading branch information
yhakbar authored Oct 10, 2023
2 parents f6d8c6b + 0f4ff4b commit 9b7847a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 68 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
document:
name: "Document"
runs-on: ubuntu-latest
if: ${{ github.triggering_actor != 'dependabot[bot]' }}
defaults:
run:
shell: bash
Expand All @@ -27,19 +28,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Setup asdf
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v2
- name: Setup rtx
uses: jdx/rtx-action@v1

- name: "Generate documentation"
run: ./scripts/document.sh
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,8 @@ jobs:
- name: "Checkout"
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v2
- name: Setup rtx
uses: jdx/rtx-action@v1

- name: "Format"
run: ./scripts/format.sh
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,8 @@ jobs:
- name: "Checkout"
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v2
- name: Setup rtx
uses: jdx/rtx-action@v1

- name: "Lint"
run: ./scripts/lint.sh
15 changes: 2 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v2
- name: Setup rtx
uses: jdx/rtx-action@v1

- name: "Run document script if necessary"
run: |
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,8 @@ jobs:
- name: "Checkout"
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v2
- name: Setup rtx
uses: jdx/rtx-action@v1

- name: "Validate Module"
run: ./scripts/validate.sh
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Use this URL for the source of the module. See the usage examples below for more details.

```hcl
github.com/pbs/terraform-aws-synthetics-module?ref=1.2.1
github.com/pbs/terraform-aws-synthetics-module?ref=x.y.z
```

### Alternative Installation Methods
Expand All @@ -22,7 +22,7 @@ Integrate this module like so:

```hcl
module "synthetics" {
source = "github.com/pbs/terraform-aws-synthetics-module?ref=1.2.1"
source = "github.com/pbs/terraform-aws-synthetics-module?ref=x.y.z"
zip_file = "path/to/file.zip"
Expand All @@ -48,7 +48,7 @@ The recommended workaround for this is to use something external to Terraform (l

If this repo is added as a subtree, then the version of the module should be close to the version shown here:

`1.2.1`
`x.y.z`

Note, however that subtrees can be altered as desired within repositories.

Expand Down

0 comments on commit 9b7847a

Please sign in to comment.