Skip to content

Commit 4d5c2b1

Browse files
committed
Merge develop into stable for v2023.11.16 release
2 parents bc8cb64 + f5783be commit 4d5c2b1

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,10 @@ jobs:
304304

305305
steps:
306306
- uses: actions/checkout@v3
307+
with:
308+
ref: stable
309+
repository: ${{ github.repository }}
310+
ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
307311

308312
- name: Get Salt Project GitHub Actions Bot Environment
309313
run: |

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# v2023.11.16
2+
3+
## What's Changed
4+
5+
- checking out stable branch on update-s3-bucket job by @felippeb in https://github.com/saltstack/salt-bootstrap/pull/1977
6+
7+
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.11.07...v2023.11.16
8+
19
# v2023.11.07
210

311
## What's Changed

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
3232

3333
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
3434

35+
- 2023.11.07: ``91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784``
3536
- 2023.08.03: ``963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8``
3637
- 2023.07.25: ``eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323``
3738
- 2023.06.28: ``f45f5da8abee27ef385131f5cfa9382d3a15863d0a05688a0404d2f057b27776``

bootstrap-salt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#======================================================================================================================
2424
set -o nounset # Treat unset variables as an error
2525

26-
__ScriptVersion="2023.11.07"
26+
__ScriptVersion="2023.11.16"
2727
__ScriptName="bootstrap-salt.sh"
2828

2929
__ScriptFullName="$0"

0 commit comments

Comments
 (0)