Skip to content

Commit

Permalink
Merge branch 'master' into fix-darwin-m1-arch-logic
Browse files Browse the repository at this point in the history
  • Loading branch information
Zordrak authored Dec 19, 2023
2 parents 1074278 + a14e553 commit 5378290
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- 'macos-latest'
- 'ubuntu-latest'
steps:
- uses: 'actions/checkout@v2'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 1
- name: 'Install Dependencies'
Expand All @@ -30,11 +30,11 @@ jobs:
run: './test/run.sh'
shell: 'bash'

- uses: 'docker/setup-buildx-action@v2'
- uses: 'docker/setup-buildx-action@v3'
if: contains(matrix.os, 'ubuntu')
with:
install: true
- uses: 'docker/build-push-action@v3'
- uses: 'docker/build-push-action@v5'
if: contains(matrix.os, 'ubuntu')
with:
context: .
Expand All @@ -60,7 +60,7 @@ jobs:
- 'ubuntu-18.04'
- 'windows-2019'
steps:
- uses: 'actions/checkout@v2'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 1
- name: 'Install Dependencies'
Expand All @@ -69,11 +69,11 @@ jobs:
run: './test/run.sh'
shell: 'bash'

- uses: 'docker/setup-buildx-action@v2'
- uses: 'docker/setup-buildx-action@v3'
if: contains(matrix.os, 'ubuntu')
with:
install: true
- uses: 'docker/build-push-action@v3'
- uses: 'docker/build-push-action@v5'
if: contains(matrix.os, 'ubuntu')
with:
context: .
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,16 @@ git clone --depth=1 https://github.com/tfutils/tfenv.git ~/.tfenv

2. Add `~/.tfenv/bin` to your `$PATH` any way you like

bash:
```console
echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ~/.bash_profile
```
zsh:
```console
$ echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ~/.zprofile
```

For WSL users
For WSL users:
```bash
echo 'export PATH=$PATH:$HOME/.tfenv/bin' >> ~/.bashrc
```
Expand Down Expand Up @@ -91,7 +96,7 @@ If a parameter is passed, available options:
- `latest-allowed` is a syntax to scan your Terraform files to detect which version is maximally allowed.
- `min-required` is a syntax to scan your Terraform files to detect which version is minimally required.

See [required_version](https://www.terraform.io/docs/configuration/terraform.html) docs. Also [see min-required & latest-allowed](#min-required) section below.
See [required_version](https://developer.hashicorp.com/terraform/language/settings) docs. Also [see min-required & latest-allowed](#min-required) section below.

```console
$ tfenv install
Expand Down
2 changes: 1 addition & 1 deletion libexec/tfenv-min-required
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ terraform {
required_version = ">= 0.0.0"
}
see https://www.terraform.io/docs/configuration/terraform.html for details';
see https://developer.hashicorp.com/terraform/language/settings for details';
};

declare min_required="$(tfenv-min-required "${TFENV_DIR:-$(pwd)}")";
Expand Down

0 comments on commit 5378290

Please sign in to comment.