From fdcfec993ba75f8631dc1a5ccc6697c65b9ade26 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Wed, 27 Nov 2024 18:57:26 +0000 Subject: [PATCH 01/10] Update develop branch for the v2024.11.27 release --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae589d07b..3b75f96ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ **Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.26...v2024.11.27 +# v2024.11.27 + +## What's Changed + +- Testing git install methods by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2057 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.26...v2024.11.27 + # v2024.11.26 ## What's Changed From 5339251d5938fa466b2f6fe8ba5b807b9b0456b5 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Wed, 27 Nov 2024 18:57:41 +0000 Subject: [PATCH 02/10] Update README.rst with 2024.11.27 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 8a2310760..745b41917 100644 --- a/README.rst +++ b/README.rst @@ -37,6 +37,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2024.11.27: ``e972bd1ef01d09cd1d9294374ef974c9e3dd9a2aee37cf3859144585fd8bf1d0`` - 2024.11.26: ``832c7a20b96e1df171d715323df9afff8a11aef42d15598c007f240bc89d723c`` - 2024.11.21: ``ddf624c3a94d721da3f7629402a6c7ecc9dd96d13c1ead2a626314e97cee982a`` - 2024.11.07: ``70a9783649e129985563d1a86cf28b8984499643e62ae1dc47dc008bd204fcbb`` From 535a53ea369b40a6219afd14df6cd6bec6633c78 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 27 Nov 2024 12:01:16 -0700 Subject: [PATCH 03/10] Updated date to overcome issue with existing tag for 2024.11.27 --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f43acdfbe..08a513ffa 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.27" +__ScriptVersion="2024.11.28" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From 677ecee80198595ea58ce21405086b020ce49869 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 27 Nov 2024 12:01:16 -0700 Subject: [PATCH 04/10] Updated date to overcome issue with existing tag for 2024.11.27 --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f43acdfbe..08a513ffa 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.27" +__ScriptVersion="2024.11.28" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From 578ee0eeeb9e13eaa5bfbb5c20ff037a44595333 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Wed, 27 Nov 2024 19:20:52 +0000 Subject: [PATCH 05/10] Update develop branch for the v2024.11.27 release --- CHANGELOG.md | 4 ++++ bootstrap-salt.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b75f96ea..4804c4edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # v2024.11.27 +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.27 + +# v2024.11.27 + ## What's Changed - Testing git install methods by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2057 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 08a513ffa..f43acdfbe 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.28" +__ScriptVersion="2024.11.27" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From 72254edd67aac6d08e14f73c9a8e7653b95d62ad Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 27 Nov 2024 12:31:39 -0700 Subject: [PATCH 06/10] Forcing git tag for release 2024.11.27 due to existing tag which was set by accident --- .github/workflows/release.yml | 2 +- bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f31d6c470..8e54b67b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -159,7 +159,7 @@ jobs: - name: Tag The ${{ needs.update-develop.outputs.release-version }} Release run: | - git tag --no-sign -m "Release ${{ needs.update-develop.outputs.release-version }}" -a ${{ needs.update-develop.outputs.release-version }} + git tag -f --no-sign -m "Release ${{ needs.update-develop.outputs.release-version }}" -a ${{ needs.update-develop.outputs.release-version }} - name: Update bootstrap-salt.sh sha256sum's run: | diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 08a513ffa..f43acdfbe 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.28" +__ScriptVersion="2024.11.27" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From ab523a74dc360dadd0d7f629105d4afedcfbd6cd Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Wed, 27 Nov 2024 19:40:25 +0000 Subject: [PATCH 07/10] Update develop branch for the v2024.11.27 release --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4804c4edc..cb299377b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ # v2024.11.27 +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.27 + +# v2024.11.27 + ## What's Changed - Testing git install methods by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2057 From 777c3ad055a6f5d29641c1c150935e1f093bf93c Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 27 Nov 2024 12:47:45 -0700 Subject: [PATCH 08/10] Revert forcing git tag, other issues with check sums calculated, easy solution is wait a day to release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e54b67b5..f31d6c470 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -159,7 +159,7 @@ jobs: - name: Tag The ${{ needs.update-develop.outputs.release-version }} Release run: | - git tag -f --no-sign -m "Release ${{ needs.update-develop.outputs.release-version }}" -a ${{ needs.update-develop.outputs.release-version }} + git tag --no-sign -m "Release ${{ needs.update-develop.outputs.release-version }}" -a ${{ needs.update-develop.outputs.release-version }} - name: Update bootstrap-salt.sh sha256sum's run: | From 5689a93c798d054e6dff2fe8d0403678a1fa3552 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Fri, 29 Nov 2024 10:41:05 -0700 Subject: [PATCH 09/10] Updated date --- bootstrap-salt.ps1 | 2 +- bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1 index 4a0d30fda..8d0c3c628 100644 --- a/bootstrap-salt.ps1 +++ b/bootstrap-salt.ps1 @@ -108,7 +108,7 @@ if ($help) { exit 0 } -$__ScriptVersion = "2024.11.27" +$__ScriptVersion = "2024.11.29" $ScriptName = $myInvocation.MyCommand.Name # We'll check for the Version next, because it also has no requirements diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f43acdfbe..49c71d3cd 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.27" +__ScriptVersion="2024.11.29" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From ce687f4066f1a69a944a6c3f00473b2ecbfa2406 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Fri, 29 Nov 2024 17:58:13 +0000 Subject: [PATCH 10/10] Update develop branch for the v2024.11.29 release --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb299377b..a2b85d2d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# v2024.11.29 + +## What's Changed + +- Updated date to overcome issue with existing tag for 2024.11.27 by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2058 +- Fix date tag by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2059 +- Revert forcing git tag, other issues with check sums calculated, easiest solution is wait a day to release by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2060 +- Updated date by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2061 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.29 + # v2024.11.27 **Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.27