Skip to content

Commit

Permalink
Merge branch 'master' into remove-versions-dir
Browse files Browse the repository at this point in the history
  • Loading branch information
Zordrak authored May 26, 2020
2 parents 0a43afe + fccc154 commit 2f97567
Show file tree
Hide file tree
Showing 27 changed files with 2,290 additions and 632 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
language: generic
matrix:
include:
- os: linux
dist: bionic
- os: linux
dist: xenial
- os: linux
dist: trusty
- os: osx
osx_image: xcode8.2 # OS X 10.12
osx_image: xcode11.3
- os: osx
osx_image: xcode8 # OS X 10.11
osx_image: xcode10.3
- os: osx
osx_image: xcode7 # OS X 10.10
osx_image: xcode9.4
script:
- ./test/run.sh
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## 2.0.0 (Unreleased)

* New logging and debugging library
* Massive testing, logging and loading refactoring
* Fix to 'use' logic: don't overwrite .terraform-version files
* Fix #167 - Never invoke use automatically on install - multiple code and testing changes for new logic
* Fix to not use 0.12.22 during testing which reports its version incorrectly
* Introduce tfenv-resolve-version to deduplicate translation of requested version into actual version
* README.md updates
* Fix #176 - New parameter TFENV_AUTO_INSTALL to handle the version specified by `use` or a `.terraform-version` file not being installed

## 1.0.2 (October 29, 2019)

* Fix failing 0.11.15-oci version, Add additional tests for 0.11.15-oci and alphas, betas and rcs #145
* Fix to README section link for .terraform-version file #146

## 1.0.1 (June 22, 2019)

* Fix '--version' flag to return version from CHANGELOG.md when not running from a git checkout.
Expand Down
Loading

0 comments on commit 2f97567

Please sign in to comment.