diff --git a/CHANGELOG.md b/CHANGELOG.md index d24c227..1a6c1a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ -## 1.0.3 +## 1.1.0 (Unreleased) + +## 1.0.3 (January 4th, 2024) diff --git a/libexec/tofuenv---version b/libexec/tofuenv---version index 71701a2..925187e 100755 --- a/libexec/tofuenv---version +++ b/libexec/tofuenv---version @@ -69,7 +69,7 @@ done; ##################### log 'debug' 'Scraping tofuenv version from CHANGELOG.md'; -version="$(awk '/^##/{ print $2; exit}' "${TOFUENV_ROOT}/CHANGELOG.md")" \ +version="$(awk 'FNR>1 && /^##/{ print $2; exit}' "${TOFUENV_ROOT}/CHANGELOG.md")" \ && log 'debug' "Found version '${version}' in CHANGELOG.md" \ || log 'error' 'Failed to scrape version from CHANGELOG.md'; diff --git a/test/test_install_and_use.sh b/test/test_install_and_use.sh index f8779d5..40f57cd 100755 --- a/test/test_install_and_use.sh +++ b/test/test_install_and_use.sh @@ -103,7 +103,7 @@ tests__kv=( "$(tofuenv list-remote | grep 'beta' | head -n 1),latest:beta" "$(tofuenv list-remote | grep 'rc' | head -n 1),latest:rc" "$(tofuenv list-remote | grep '^1\.6\.' | head -n 1),latest:^1.6." - '1.6.0-rc1,latest:^1\.6' + '1.6.0,latest:^1\.6' '1.6.0-alpha5' '1.6.0-rc1,v1.6.0-rc1' ); diff --git a/test/test_use_latestallowed.sh b/test/test_use_latestallowed.sh index 1180407..6f98348 100755 --- a/test/test_use_latestallowed.sh +++ b/test/test_use_latestallowed.sh @@ -56,13 +56,13 @@ cleanup || log 'error' 'Cleanup failed?!'; log 'info' '### Install latest-allowed normal version (#.#.#)'; echo "terraform { - required_version = \"~> 1.6.0-rc1\" + required_version = \"~> 1.6.0\" }" > latest_allowed.tf; ( tofuenv install latest-allowed; tofuenv use latest-allowed; - check_active_version 1.6.0-rc1; + check_active_version 1.6.0; ) || error_and_proceed 'Latest allowed version does not match'; cleanup || log 'error' 'Cleanup failed?!'; @@ -92,7 +92,7 @@ echo "terraform { ( tofuenv install latest-allowed; tofuenv use latest-allowed; - check_active_version 1.6.0-rc1; + check_active_version 1.6.0; ) || error_and_proceed 'Latest allowed incomplete-version does not match'; cleanup || log 'error' 'Cleanup failed?!'; @@ -107,7 +107,7 @@ echo 'latest-allowed' > .opentofu-version; ( TOFUENV_AUTO_INSTALL=true tofu version; - check_active_version 1.6.0-rc1; + check_active_version 1.6.0; ) || error_and_proceed 'Latest allowed auto-installed version does not match'; cleanup || log 'error' 'Cleanup failed?!'; @@ -123,7 +123,7 @@ echo 'latest-allowed' > chdir-dir/.opentofu-version ( TOFUENV_AUTO_INSTALL=true tofu -chdir=chdir-dir version; - check_active_version 1.6.0-rc1 chdir-dir; + check_active_version 1.6.0 chdir-dir; ) || error_and_proceed 'Latest allowed version from -chdir does not match'; cleanup || log 'error' 'Cleanup failed?!';