Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto CHANGELOG.md preparation #39

Merged
merged 3 commits into from
Jan 10, 2024
Merged

Auto CHANGELOG.md preparation #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c74f3c
Auto CHANGELOG.md preparation
Nmishin Jan 10, 2024
c54c7a4
CHANGELOG.md update
Nmishin Jan 10, 2024
63087aa
Fix tests
Nmishin Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
## 1.0.3
## 1.1.0 (Unreleased)

## 1.0.3 (January 4th, 2024)
2 changes: 1 addition & 1 deletion libexec/tofuenv---version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion test/test_install_and_use.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
Expand Down
10 changes: 5 additions & 5 deletions test/test_use_latestallowed.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?!';
Expand Down Expand Up @@ -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?!';
Expand All @@ -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?!';
Expand All @@ -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?!';
Expand Down