Merge branch 'develop' into patch-1

.github/workflows/release.yml

@@ -304,6 +304,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: stable
+          repository: ${{ github.repository }}
+          ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |

CHANGELOG.md

@@ -1,3 +1,27 @@
+# v2023.11.16
+
+## What's Changed
+
+- checking out stable branch on update-s3-bucket job by @felippeb in https://github.com/saltstack/salt-bootstrap/pull/1977
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.11.07...v2023.11.16
+
+# v2023.11.07
+
+## What's Changed
+
+- cleanup old information in the README.rst file by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1955
+- Moving quick start scripts to bootstrap repo. by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1960
+- Suppress progress bar by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1964
+- Fix global variable by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1965
+- Debian 12 arm64 by @joelpmichael in https://github.com/saltstack/salt-bootstrap/pull/1962
+- Mirror Linux output, display root_dir by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1967
+- Add asterisks to the output by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1968
+- Fixes to salt-quick-start.sh by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1973
+- Update requirements by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1974
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.08.03...v2023.11.07
+
 # v2023.08.03
 
 ## What's Changed

README.rst

@@ -32,6 +32,8 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2023.11.16: ``3757ed82161113fed4c711fd7332e922265eeeb54e6e4f657a08ea82d57cc3a2``
+- 2023.11.07: ``91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784``
 - 2023.08.03: ``963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8``
 - 2023.07.25: ``eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323``
 - 2023.06.28: ``f45f5da8abee27ef385131f5cfa9382d3a15863d0a05688a0404d2f057b27776``

bootstrap-salt.sh

@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2023.08.03"
+__ScriptVersion="2023.11.16"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -1522,9 +1522,9 @@ __check_dpkg_architecture() {
             if [ "$_CUSTOM_REPO_URL" != "null" ]; then
                 warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents."
             else
-                # Saltstack official repository has arm64 metadata beginning with Debian 11,
+                # Saltstack official repository has arm64 metadata beginning with Debian 10,
                 # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent
-                if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
+                if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then
                   __REPO_ARCH="amd64"
                 else
                   __REPO_ARCH="arm64"

requirements/release.txt

@@ -1,68 +1,68 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile requirements/release.in
+#    pip-compile '.\requirements\release.in'
 #
-attrs==22.2.0
+attrs==23.1.0
     # via python-tools-scripts
-boto3==1.26.110
-    # via -r requirements/release.in
-botocore==1.29.110
+boto3==1.28.79
+    # via -r .\requirements\release.in
+botocore==1.31.79
     # via
     #   boto3
     #   s3transfer
-certifi==2023.07.22
+certifi==2023.7.22
     # via requests
-cfgv==3.3.1
+cfgv==3.4.0
     # via pre-commit
-charset-normalizer==3.1.0
+charset-normalizer==3.3.2
     # via requests
-distlib==0.3.6
+distlib==0.3.7
     # via virtualenv
-filelock==3.11.0
+filelock==3.13.1
     # via virtualenv
-identify==2.5.22
+identify==2.5.31
     # via pre-commit
 idna==3.4
     # via requests
 jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-markdown-it-py==2.2.0
+markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-nodeenv==1.7.0
+nodeenv==1.8.0
     # via pre-commit
-platformdirs==3.2.0
+platformdirs==3.11.0
     # via virtualenv
-pre-commit==3.2.2
-    # via -r requirements/release.in
-pygments==2.15.0
+pre-commit==3.5.0
+    # via -r .\requirements\release.in
+pygments==2.16.1
     # via rich
 python-dateutil==2.8.2
     # via botocore
-python-tools-scripts==0.12.0
-    # via -r requirements/release.in
-pyyaml==6.0
+python-tools-scripts==0.18.1
+    # via -r .\requirements\release.in
+pyyaml==6.0.1
     # via pre-commit
-requests==2.28.2
+requests==2.31.0
     # via python-tools-scripts
-rich==13.3.3
+rich==13.6.0
     # via python-tools-scripts
-s3transfer==0.6.0
+s3transfer==0.7.0
     # via boto3
 six==1.16.0
     # via python-dateutil
-typing-extensions==4.5.0
+typing-extensions==4.8.0
     # via python-tools-scripts
-urllib3==1.26.15
+urllib3==2.0.7
     # via
     #   botocore
     #   requests
-virtualenv==20.21.0
+virtualenv==20.24.6
     # via pre-commit
 
 # The following packages are considered to be unsafe in a requirements file:

salt-quick-start.sh

@@ -183,7 +183,7 @@ EOT
 cat <<EOT >${_PATH}/Saltfile
 salt-call:
   local: True
-  config_dir: ${_PATH}
+  config_dir: ${_PATH}/etc/salt
   log_file: ${_PATH}/var/log/salt/minion
   cachedir: ${_PATH}/var/cache/salt
   file_root: ${_PATH}/srv/salt