diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 31355b01643c4c1e655d7f5e3da13c9074066472..3f83684cbc44c3fd95e7ae21b39ad3557c9402b3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,18 @@ General information about release upgrades are documented at .. towncrier release notes start +v11.0.3 (2025-12-09) +-------------------- + +Bugfixes +~~~~~~~~ + +- Fixed a bug which prevented the release migration script :ref:`migrate-to-release.sh` + from completing successfully with :ref:`Terraform disabled `. (`!2209 `_) +- Fixed a bug in the release migration that left new Terraform state uncommitted. (`!2209 `_) +- Fixed a bug which prevented to rerun the release migration script :ref:`migrate-to-release.sh`. (`!2209 `_) + + v11.0.2 (2025-10-23) -------------------- diff --git a/actions/release-migrations/v11-01-yaml-hosts.sh b/actions/release-migrations/v11-01-yaml-hosts.sh index d25ce91113459b62f83a154dc6183375532940f4..2fe7081a2c2a2ba4ffb2a13cf6dbd7bfa72e5504 100755 --- a/actions/release-migrations/v11-01-yaml-hosts.sh +++ b/actions/release-migrations/v11-01-yaml-hosts.sh @@ -6,10 +6,13 @@ actions_dir="$(dirname "$0")/.." # shellcheck source=actions/lib.sh . "$actions_dir/lib.sh" -if [ "${tf_usage:-true}" == 'true' ]; then +load_conf_vars + +if [ "${tf_usage:?}" == 'true' ]; then notef "Removing obsolete state files..." - run git rm -rf "$terraform_state_dir/rendered" + run git rm --ignore-unmatch --force -r "$terraform_state_dir/rendered" notef "Running Terraform stage to create output files" run "$actions_dir/apply-terraform.sh" + run git add "$state_dir/terraform" fi diff --git a/version b/version index a1ea332d2835ac2a6b96f97dfedc59309f1459a0..e7e9473ae39a36eeee6d131094c5dbd8e35718db 100644 --- a/version +++ b/version @@ -1 +1 @@ -11.0.2 +11.0.3