From 7e89520f4bdbacb5861aca209f0b8f89271287e1 Mon Sep 17 00:00:00 2001 From: Mike Peachey Date: Wed, 9 Feb 2022 20:38:29 +0000 Subject: [PATCH 1/4] Update CHANGELOG for 2.2.3 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef9ec7b0..63621e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 2.2.3 (Feb 9, 2022) + + * Fix: mktemp not working correctly on Alpine Linux (#285) + * Add support of ARM64 (#280) + * Add support for tf.json files on min-required (#277) + * Fix issue #210 - allow non-numeric values for DEBUG (#274) + * Download latest version if user uses regex and TFENV_AUTO_INSTALL is true (#272) + * Add tfenv pin command (#270) + ## 2.2.2 (May 6, 2021) * remove trust from revoked signing key as of hcsec-2021-12 From fb43ba4d361a70580bb20ad43a5a8f7065801430 Mon Sep 17 00:00:00 2001 From: Volodymyr Samusia Date: Tue, 17 Aug 2021 01:55:50 +0300 Subject: [PATCH 2/4] Fix ARM64 support for old terraform versions --- libexec/tfenv-install | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libexec/tfenv-install b/libexec/tfenv-install index ec102477..f6a0246c 100755 --- a/libexec/tfenv-install +++ b/libexec/tfenv-install @@ -85,7 +85,16 @@ fi; # Add support of ARM64 for Linux & Apple Silicon case "$(uname -m)" in aarch64* | arm64*) - TFENV_ARCH="${TFENV_ARCH:-arm64}"; + # There is no arm64 support for versions: + # < 0.11.15 + # >= 0.12.0, < 0.12.30 + if [[ "${version}" =~ (0\.(([0-9]|1[0-1])).[0-1][0-4]?$) ]] || [[ "${version}" =~ 0\.12\.[0-2][0-9]?$ ]] ; then + TFENV_ARCH="${TFENV_ARCH:-amd64}"; + echo "1" + else + TFENV_ARCH="${TFENV_ARCH:-arm64}"; + echo "2" + fi; ;; *) TFENV_ARCH="${TFENV_ARCH:-amd64}"; From 1fed6cfa250355845a9e970b20513ab76fc8008b Mon Sep 17 00:00:00 2001 From: Volodymyr Samusia Date: Tue, 17 Aug 2021 13:10:54 +0300 Subject: [PATCH 3/4] Remove unused commands --- libexec/tfenv-install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libexec/tfenv-install b/libexec/tfenv-install index f6a0246c..ae09187c 100755 --- a/libexec/tfenv-install +++ b/libexec/tfenv-install @@ -88,12 +88,10 @@ case "$(uname -m)" in # There is no arm64 support for versions: # < 0.11.15 # >= 0.12.0, < 0.12.30 - if [[ "${version}" =~ (0\.(([0-9]|1[0-1])).[0-1][0-4]?$) ]] || [[ "${version}" =~ 0\.12\.[0-2][0-9]?$ ]] ; then + if [[ "${version}" =~ 0\.(([0-9]|1[0-1])).[0-1][0-4]?$ || "${version}" =~ 0\.12\.[0-2][0-9]?$ ]]; then TFENV_ARCH="${TFENV_ARCH:-amd64}"; - echo "1" else TFENV_ARCH="${TFENV_ARCH:-arm64}"; - echo "2" fi; ;; *) From 3cacd913cdfd4754b3969f9ed53af6610fec2e5d Mon Sep 17 00:00:00 2001 From: Volodymyr Samusia Date: Thu, 19 Aug 2021 01:46:33 +0300 Subject: [PATCH 4/4] Fix ARM64 support for 0.13 terraform versions Fix regexp for previous versions --- libexec/tfenv-install | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libexec/tfenv-install b/libexec/tfenv-install index ae09187c..8f684e86 100755 --- a/libexec/tfenv-install +++ b/libexec/tfenv-install @@ -88,7 +88,12 @@ case "$(uname -m)" in # There is no arm64 support for versions: # < 0.11.15 # >= 0.12.0, < 0.12.30 - if [[ "${version}" =~ 0\.(([0-9]|1[0-1])).[0-1][0-4]?$ || "${version}" =~ 0\.12\.[0-2][0-9]?$ ]]; then + # >= 0.13.0, < 0.13.5 + if [[ "${version}" =~ 0\.(([0-9]|10))\.\d* || + "${version}" =~ 0\.11\.(([0-9]|1[0-4]))$ || + "${version}" =~ 0\.12\.(([0-9]|[1-2][0-9]))$ || + "${version}" =~ 0\.13\.[0-4]$ + ]]; then TFENV_ARCH="${TFENV_ARCH:-amd64}"; else TFENV_ARCH="${TFENV_ARCH:-arm64}";