From 725d18f6c8cc619d7c3634cb2e76812803aff424 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 23 Jul 2024 21:48:31 +0000
Subject: [PATCH 01/27] Update README.rst with 2024.07.23 release sha256sum

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index b2da28c79..1f1687f83 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.07.23: ``7212b6b497b5c3d2bf15bfe5301625ec7bc1bf3e2949cd47d8e2073614935bf8``
 - 2024.07.18: ``92a74e7ff8a9032a7713c2b3955991d66aaca08a4eb9494ce3dd66b5044f6bc3``
 - 2024.07.16: ``4f76d1549c71d696a605f97645d8633b6269c4d9ae54b1fbdfedca1dcf893e7a``
 - 2024.07.12: ``526f4a5383db308081a120e26988679238ca6add4bf7a82120cbe71d57ab826e``

From 064d13cf4190dde74896ece324a2ecb0e1bf4314 Mon Sep 17 00:00:00 2001
From: thilo <pinguin@digitalkr.am>
Date: Fri, 6 Sep 2024 08:32:05 +0200
Subject: [PATCH 02/27] Added KDE neon to list of Ubuntu derivates (again)

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c288ec057..072b3fd8a 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1280,7 +1280,7 @@ __gather_system_info() {
 #----------------------------------------------------------------------------------------------------------------------
 # shellcheck disable=SC2034
 __ubuntu_derivatives_translation() {
-    UBUNTU_DERIVATIVES="(trisquel|linuxmint|elementary_os|pop)"
+    UBUNTU_DERIVATIVES="(trisquel|linuxmint|elementary_os|pop|neon)"
     # Mappings
     trisquel_10_ubuntu_base="20.04"
     trisquel_11_ubuntu_base="22.04"

From b17e02b4b39db113ce28f1ec5f683dbd9822e186 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 17 Sep 2024 16:32:36 -0600
Subject: [PATCH 03/27] Added Salt version information and debug info

---
 bootstrap-salt.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 072b3fd8a..1c0d32b44 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2106,6 +2106,7 @@ __git_clone_and_checkout() {
                     # shellcheck disable=SC2164
                     cd "${_SALT_GIT_CHECKOUT_DIR}"
                     __SHALLOW_CLONE=$BS_TRUE
+                    echoinfo  "shallow git cloned $GIT_REV, version $(git describe)"
                 else
                     # Shallow clone above failed(missing upstream tags???), let's resume the old behaviour.
                     echowarn "Failed to shallow clone."
@@ -2123,6 +2124,8 @@ __git_clone_and_checkout() {
             # shellcheck disable=SC2164
             cd "${_SALT_GIT_CHECKOUT_DIR}"
 
+            echoinfo  "git cloned $GIT_REV, version $(git describe)"
+
             if ! echo "$_SALT_REPO_URL" | grep -q -F -w "${_SALTSTACK_REPO_URL#*://}"; then
                 # We need to add the saltstack repository as a remote and fetch tags for proper versioning
                 echoinfo "Adding SaltStack's Salt repository as a remote"
@@ -2698,7 +2701,9 @@ EOM
     echoinfo "Installing salt using ${_py_exe}"
     cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
 
-    mkdir /tmp/git/deps
+    mkdir -p /tmp/git/deps
+    echodebug "Created directory /tmp/git/deps"
+    echodebug "Installing Salt dependencies for Salt version $(git describe)"
 
     if [ ${DISTRO_NAME_L} = "ubuntu" ] && [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
         echodebug "Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', upgrading from default pip works"

From 6c37a9a9c3a9999a3b84e9c5280ed33b28a3af41 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 17 Sep 2024 17:33:51 -0600
Subject: [PATCH 04/27] Getting Salt version directly

---
 bootstrap-salt.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 1c0d32b44..4665bef6e 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2106,7 +2106,7 @@ __git_clone_and_checkout() {
                     # shellcheck disable=SC2164
                     cd "${_SALT_GIT_CHECKOUT_DIR}"
                     __SHALLOW_CLONE=$BS_TRUE
-                    echoinfo  "shallow git cloned $GIT_REV, version $(git describe)"
+                    echoinfo  "shallow git cloned $GIT_REV, version $(python3 salt/version.py)"
                 else
                     # Shallow clone above failed(missing upstream tags???), let's resume the old behaviour.
                     echowarn "Failed to shallow clone."
@@ -2124,7 +2124,7 @@ __git_clone_and_checkout() {
             # shellcheck disable=SC2164
             cd "${_SALT_GIT_CHECKOUT_DIR}"
 
-            echoinfo  "git cloned $GIT_REV, version $(git describe)"
+            echoinfo  "git cloned $GIT_REV, version $(python3 salt/version.py)"
 
             if ! echo "$_SALT_REPO_URL" | grep -q -F -w "${_SALTSTACK_REPO_URL#*://}"; then
                 # We need to add the saltstack repository as a remote and fetch tags for proper versioning
@@ -2703,7 +2703,7 @@ EOM
 
     mkdir -p /tmp/git/deps
     echodebug "Created directory /tmp/git/deps"
-    echodebug "Installing Salt dependencies for Salt version $(git describe)"
+    echodebug "Installing Salt dependencies for Salt version $(python3 salt/version.py)"
 
     if [ ${DISTRO_NAME_L} = "ubuntu" ] && [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
         echodebug "Ubuntu 22.04 has problem with base.txt requirements file, not parsing sys_platform == 'win32', upgrading from default pip works"

From 9848c3311e9ad4e5f8daf75b2863808299c860cf Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Wed, 18 Sep 2024 09:58:40 -0600
Subject: [PATCH 05/27] Git shallow cloning removal of depth

---
 bootstrap-salt.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4665bef6e..b98f17e37 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -260,7 +260,7 @@ _EXTRA_PACKAGES=""
 _HTTP_PROXY=""
 _SALT_GIT_CHECKOUT_DIR=${BS_SALT_GIT_CHECKOUT_DIR:-/tmp/git/salt}
 _NO_DEPS=$BS_FALSE
-_FORCE_SHALLOW_CLONE=$BS_FALSE
+## DGM _FORCE_SHALLOW_CLONE=$BS_FALSE
 _DISABLE_SSL=$BS_FALSE
 _DISABLE_REPOS=$BS_FALSE
 _CUSTOM_REPO_URL="null"
@@ -2102,7 +2102,12 @@ __git_clone_and_checkout() {
             if [ "$(git clone 2>&1 | grep 'single-branch')" != "" ]; then
                 # The "--single-branch" option is supported, attempt shallow cloning
                 echoinfo "Attempting to shallow clone $GIT_REV from Salt's repository ${_SALT_REPO_URL}"
-                if git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
+                ## DGM Shallow cloning is resulting in the wrong version of Salt, even with a depth of 5
+                ## DGM getting 3007.0+0na.246d066 when it should be 3007.1+410.g246d066457
+                ## DGM disabling for now
+                ## DGM if git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
+                echodebug "git command, git clone --branch $GIT_REV $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
+                if git clone --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
                     # shellcheck disable=SC2164
                     cd "${_SALT_GIT_CHECKOUT_DIR}"
                     __SHALLOW_CLONE=$BS_TRUE
@@ -2120,6 +2125,7 @@ __git_clone_and_checkout() {
         fi
 
         if [ "$__SHALLOW_CLONE" -eq $BS_FALSE ]; then
+            echodebug "shadow clone false, BS_FALSE $BS_FALSE, git clone $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
             git clone "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" || return 1
             # shellcheck disable=SC2164
             cd "${_SALT_GIT_CHECKOUT_DIR}"

From 8c9e6621db01ea9e891d1f6406f0f56a83433b1b Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Wed, 18 Sep 2024 17:00:36 -0600
Subject: [PATCH 06/27] Removed testing for OpenSUSE Tumbleweed and install
 contextvars for Fedora git

---
 .github/workflows/ci.yml                | 15 ---------------
 .github/workflows/templates/generate.py | 14 +++++++-------
 bootstrap-salt.sh                       |  4 ++++
 kitchen.yml                             | 17 +++++++++--------
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c81057c1..bc416fed5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -346,20 +346,6 @@ jobs:
       instances: '["latest", "default"]'
 
 
-  opensuse-tumbleweed:
-    name: Opensuse Tumbleweed
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: opensuse-tumbleweed
-      display-name: Opensuse Tumbleweed
-      timeout: 20
-      instances: '["git-master", "latest", "default"]'
-
-
   oraclelinux-8:
     name: Oracle Linux 8
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -510,7 +496,6 @@ jobs:
       - gentoo
       - gentoo-systemd
       - opensuse-15
-      - opensuse-tumbleweed
       - oraclelinux-8
       - oraclelinux-9
       - photon-4
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index a1cd88726..0fb618158 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -7,6 +7,7 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 LINUX_DISTROS = [
     "almalinux-8",
     "almalinux-9",
@@ -20,7 +21,6 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-8",
     "oraclelinux-9",
     "photon-4",
@@ -43,6 +43,7 @@
 
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 STABLE_DISTROS = [
     "almalinux-8",
     "almalinux-9",
@@ -54,7 +55,6 @@
     "fedora-39",
     "fedora-40",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-8",
     "oraclelinux-9",
     "photon-4",
@@ -99,6 +99,7 @@
     "ubuntu-2404",
 ]
 
+##    "opensuse-tumbleweed",
 BLACKLIST_3006 = [
     "arch",
     "debian-12",
@@ -106,22 +107,22 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "ubuntu-2404",
 ]
 
+##    "opensuse-tumbleweed",
 BLACKLIST_3007 = [
     "arch",
     "fedora-39",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "photon-4",
     "photon-5",
 ]
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 BLACKLIST_GIT_3006 = [
     "almalinux-9",
     "amazon-2",
@@ -133,7 +134,6 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-9",
     "photon-4",
     "photon-5",
@@ -144,6 +144,7 @@
 ]
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 BLACKLIST_GIT_3007 = [
     "almalinux-9",
     "amazon-2",
@@ -156,7 +157,6 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-9",
     "photon-4",
     "photon-5",
@@ -240,6 +240,7 @@
 ]
 
 ##    "amazon-2023": "Amazon 2023",
+##    "opensuse-tumbleweed": "Opensuse Tumbleweed",
 DISTRO_DISPLAY_NAMES = {
     "almalinux-8": "AlmaLinux 8",
     "almalinux-9": "AlmaLinux 9",
@@ -253,7 +254,6 @@
     "gentoo": "Gentoo",
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
-    "opensuse-tumbleweed": "Opensuse Tumbleweed",
     "oraclelinux-8": "Oracle Linux 8",
     "oraclelinux-9": "Oracle Linux 9",
     "photon-4": "Photon OS 4",
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b98f17e37..ef88685c3 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3843,6 +3843,10 @@ install_fedora_git_deps() {
         CONFIG_SALT_FUNC="config_salt"
     fi
 
+    _fedora_dep="contextvars"
+    echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_fedora_dep}'"
+    ${_PY_EXE} -m pip install --upgrade "${_fedora_dep}"
+
     return 0
 }
 
diff --git a/kitchen.yml b/kitchen.yml
index 4fe49f6f8..62cc73808 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -36,6 +36,15 @@ provisioner:
 ##        - yum -y install --allowerasing procps-ng curl
 ##        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
 
+##  - name: opensuse-tumbleweed
+##    driver:
+##      image: opensuse/tumbleweed:latest
+##      provision_command:
+##        - *opensuse_provision_command_01
+##        - *opensuse_provision_command_02
+##        - *opensuse_provision_command_03
+##        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+
 platforms:
   - name: almalinux-9
     driver:
@@ -104,14 +113,6 @@ platforms:
         - &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1
         - &opensuse_provision_command_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
         - &opensuse_provision_command_03 systemctl enable sshd.service
-  - name: opensuse-tumbleweed
-    driver:
-      image: opensuse/tumbleweed:latest
-      provision_command:
-        - *opensuse_provision_command_01
-        - *opensuse_provision_command_02
-        - *opensuse_provision_command_03
-        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: rockylinux-9
     driver:
       platform: centosstream

From fba26a227b17a999b0778a5a369a6258c7ef069a Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 19 Sep 2024 09:17:30 -0600
Subject: [PATCH 07/27] Forcing setuptools to Salt requirements/constraints.txt
  setuptools >= 65.6.3,< 69.0

---
 bootstrap-salt.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index ef88685c3..6abf83cbb 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -272,7 +272,9 @@ _ONEDIR_DIR="salt"
 _ONEDIR_NIGHTLY_DIR="salt-dev/${_ONEDIR_DIR}"
 _PY_EXE="python3"
 _MINIMUM_PIP_VERSION="9.0.1"
-_MINIMUM_SETUPTOOLS_VERSION="9.1"
+## DGM _MINIMUM_SETUPTOOLS_VERSION="9.1"
+_MINIMUM_SETUPTOOLS_VERSION="65.6.3"
+_MAXIMUM_SETUPTOOLS_VERSION="69"
 _PIP_INSTALL_ARGS="--prefix=/usr"
 _PIP_DOWNLOAD_ARGS=""
 _QUICK_START="$BS_FALSE"
@@ -1853,7 +1855,7 @@ if [ "$ITYPE" = "git" ]; then
     echowarn "git based installations will always install salt"
     echowarn "and its dependencies using pip which will be upgraded to"
     echowarn "at least v${_MINIMUM_PIP_VERSION}, and, in case the setuptools version is also"
-    echowarn "too old, it will be upgraded to at least v${_MINIMUM_SETUPTOOLS_VERSION}"
+    echowarn "too old, it will be upgraded to at least v${_MINIMUM_SETUPTOOLS_VERSION} and less than v${_MAXIMUM_SETUPTOOLS_VERSION}"
     echo
     echowarn "You have 10 seconds to cancel and stop the bootstrap process..."
     echo
@@ -2687,7 +2689,7 @@ EOM
         echodebug "Installed pip version: $(${_pip_cmd} --version)"
     fi
 
-    _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
+    _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<${_MAXIMUM_SETUPTOOLS_VERSION}"
     if [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
         echoerror "Python version is no longer supported, only Python 3"
         return 1
@@ -2704,7 +2706,7 @@ EOM
     echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade ${_PIP_INSTALL_ARGS}  wheel ${_setuptools_dep}"
     ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --upgrade ${_PIP_INSTALL_ARGS}  wheel "${_setuptools_dep}"
 
-    echoinfo "Installing salt using ${_py_exe}"
+    echoinfo "Installing salt using ${_py_exe}, $(${_py_exe} --version)"
     cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
 
     mkdir -p /tmp/git/deps
@@ -6039,7 +6041,7 @@ install_photon_git_deps() {
 
     if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then
       # Need newer version of setuptools on Photon
-      _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
+      _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<${_MAXIMUM_SETUPTOOLS_VERSION}"
       echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_setuptools_dep}'"
       ${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
     fi

From d7baa83fc61ae892213ff0002e66e5ae1ac4b412 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 19 Sep 2024 09:18:35 -0600
Subject: [PATCH 08/27] Fixed typo

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 6abf83cbb..38a76abb2 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -274,7 +274,7 @@ _PY_EXE="python3"
 _MINIMUM_PIP_VERSION="9.0.1"
 ## DGM _MINIMUM_SETUPTOOLS_VERSION="9.1"
 _MINIMUM_SETUPTOOLS_VERSION="65.6.3"
-_MAXIMUM_SETUPTOOLS_VERSION="69"
+_MAXIMUM_SETUPTOOLS_VERSION="69.0"
 _PIP_INSTALL_ARGS="--prefix=/usr"
 _PIP_DOWNLOAD_ARGS=""
 _QUICK_START="$BS_FALSE"

From da9ad0b8bf9c7501ec2e4c39236b3228f391b7cf Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 19 Sep 2024 14:05:23 -0600
Subject: [PATCH 09/27] Force Arch git deps to use cryptography 42.0.0

---
 bootstrap-salt.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 38a76abb2..2329f91d3 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5734,6 +5734,10 @@ install_arch_linux_git_deps() {
         CONFIG_SALT_FUNC="config_salt"
     fi
 
+    _arch_dep="cryptography==42.0.0"
+    echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_arch_dep}'"
+    ${_PY_EXE} -m pip install --upgrade "${_arch_dep}"
+
     return 0
 }
 

From 70558b1768beb8bed66cb8cb319893f787b17d5f Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 19 Sep 2024 14:29:55 -0600
Subject: [PATCH 10/27] Forcing pip install on Arch

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2329f91d3..6f039919c 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5735,7 +5735,7 @@ install_arch_linux_git_deps() {
     fi
 
     _arch_dep="cryptography==42.0.0"
-    echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_arch_dep}'"
+    echodebug "Running '${_PY_EXE} -m pip install -break-system-packages --upgrade ${_arch_dep}'"
     ${_PY_EXE} -m pip install --upgrade "${_arch_dep}"
 
     return 0

From ae440cb321259d138bdeed2eb2592744c20b16d8 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 19 Sep 2024 14:49:28 -0600
Subject: [PATCH 11/27] Fix typo

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 6f039919c..87ee6cd43 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5735,7 +5735,7 @@ install_arch_linux_git_deps() {
     fi
 
     _arch_dep="cryptography==42.0.0"
-    echodebug "Running '${_PY_EXE} -m pip install -break-system-packages --upgrade ${_arch_dep}'"
+    echodebug "Running '${_PY_EXE} -m pip install --break-system-packages --upgrade ${_arch_dep}'"
     ${_PY_EXE} -m pip install --upgrade "${_arch_dep}"
 
     return 0

From 7c6a4a0da7333db9777b60d591903859a6db5552 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 09:47:04 -0600
Subject: [PATCH 12/27] debugging

---
 bootstrap-salt.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 87ee6cd43..468fed6ef 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1238,6 +1238,7 @@ __gather_linux_system_info() {
         esac
         DISTRO_NAME=$n
         DISTRO_VERSION=$v
+        echodebug "Linux distro '${DISTRO_NAME}', distro version '${DISTRO_VERSION}'"
         break
     done
 }
@@ -1250,6 +1251,7 @@ __gather_linux_system_info() {
 __gather_osx_system_info() {
     DISTRO_NAME="MacOSX"
     DISTRO_VERSION=$(sw_vers -productVersion)
+    echodebug "MacOS distro '${DISTRO_NAME}', distro version '${DISTRO_VERSION}'"
 }
 
 
@@ -2742,6 +2744,13 @@ EOM
 
     echoinfo "Installing Built Salt Wheel"
     ${_pip_cmd} uninstall --yes ${_USE_BREAK_SYSTEM_PACKAGES} salt 2>/dev/null || true
+
+    if [ "${DISTRO_NAME}"  = "Arch Linux" ]; then
+        _arch_dep="cryptography==42.0.0"
+        echodebug "Running '${_pip_cmd} --force-reinstall --break-system-packages ${_arch_dep}'"
+        ${_pip_cmd} --force-reinstall --break-system-packages "${_arch_dep}"
+    fi
+
     echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} /tmp/git/deps/salt*.whl'"
 
     ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
@@ -5734,10 +5743,6 @@ install_arch_linux_git_deps() {
         CONFIG_SALT_FUNC="config_salt"
     fi
 
-    _arch_dep="cryptography==42.0.0"
-    echodebug "Running '${_PY_EXE} -m pip install --break-system-packages --upgrade ${_arch_dep}'"
-    ${_PY_EXE} -m pip install --upgrade "${_arch_dep}"
-
     return 0
 }
 

From ec457c25ae5377e45cef4c1605bab6a294046542 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 10:22:37 -0600
Subject: [PATCH 13/27] more debugging

---
 bootstrap-salt.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 468fed6ef..9ac1a0659 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1238,7 +1238,6 @@ __gather_linux_system_info() {
         esac
         DISTRO_NAME=$n
         DISTRO_VERSION=$v
-        echodebug "Linux distro '${DISTRO_NAME}', distro version '${DISTRO_VERSION}'"
         break
     done
 }
@@ -1251,7 +1250,6 @@ __gather_linux_system_info() {
 __gather_osx_system_info() {
     DISTRO_NAME="MacOSX"
     DISTRO_VERSION=$(sw_vers -productVersion)
-    echodebug "MacOS distro '${DISTRO_NAME}', distro version '${DISTRO_VERSION}'"
 }
 
 
@@ -2747,12 +2745,14 @@ EOM
 
     if [ "${DISTRO_NAME}"  = "Arch Linux" ]; then
         _arch_dep="cryptography==42.0.0"
-        echodebug "Running '${_pip_cmd} --force-reinstall --break-system-packages ${_arch_dep}'"
-        ${_pip_cmd} --force-reinstall --break-system-packages "${_arch_dep}"
+        echodebug "Running '${_pip_cmd} install --force-reinstall --break-system-packages ${_arch_dep}'"
+        ${_pip_cmd} install --force-reinstall --break-system-packages "${_arch_dep}"
     fi
 
     echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} /tmp/git/deps/salt*.whl'"
 
+    echodebug "Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} /tmp/git/deps/salt*.whl"
+
     ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
         ${_PIP_INSTALL_ARGS} \
         --global-option="--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS}" \

From 425fb310f6fe3b3ff5b8298f446d012d9e8e76b1 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 11:19:13 -0600
Subject: [PATCH 14/27] Setting cryptography to  42.0.7 for Arch, its current
 version - debugging

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 9ac1a0659..9802a25b2 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2744,7 +2744,7 @@ EOM
     ${_pip_cmd} uninstall --yes ${_USE_BREAK_SYSTEM_PACKAGES} salt 2>/dev/null || true
 
     if [ "${DISTRO_NAME}"  = "Arch Linux" ]; then
-        _arch_dep="cryptography==42.0.0"
+        _arch_dep="cryptography==42.0.7"    # debug matching current Arch version of python-cryptography
         echodebug "Running '${_pip_cmd} install --force-reinstall --break-system-packages ${_arch_dep}'"
         ${_pip_cmd} install --force-reinstall --break-system-packages "${_arch_dep}"
     fi

From a4b8359357e01b5cc32b3b9692ed0991fead0b9c Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 12:51:23 -0600
Subject: [PATCH 15/27] Finialize changes for working Arch git-master

---
 bootstrap-salt.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 9802a25b2..d2aab1708 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -260,7 +260,7 @@ _EXTRA_PACKAGES=""
 _HTTP_PROXY=""
 _SALT_GIT_CHECKOUT_DIR=${BS_SALT_GIT_CHECKOUT_DIR:-/tmp/git/salt}
 _NO_DEPS=$BS_FALSE
-## DGM _FORCE_SHALLOW_CLONE=$BS_FALSE
+_FORCE_SHALLOW_CLONE=$BS_FALSE
 _DISABLE_SSL=$BS_FALSE
 _DISABLE_REPOS=$BS_FALSE
 _CUSTOM_REPO_URL="null"
@@ -272,7 +272,6 @@ _ONEDIR_DIR="salt"
 _ONEDIR_NIGHTLY_DIR="salt-dev/${_ONEDIR_DIR}"
 _PY_EXE="python3"
 _MINIMUM_PIP_VERSION="9.0.1"
-## DGM _MINIMUM_SETUPTOOLS_VERSION="9.1"
 _MINIMUM_SETUPTOOLS_VERSION="65.6.3"
 _MAXIMUM_SETUPTOOLS_VERSION="69.0"
 _PIP_INSTALL_ARGS="--prefix=/usr"
@@ -2104,10 +2103,9 @@ __git_clone_and_checkout() {
             if [ "$(git clone 2>&1 | grep 'single-branch')" != "" ]; then
                 # The "--single-branch" option is supported, attempt shallow cloning
                 echoinfo "Attempting to shallow clone $GIT_REV from Salt's repository ${_SALT_REPO_URL}"
-                ## DGM Shallow cloning is resulting in the wrong version of Salt, even with a depth of 5
-                ## DGM getting 3007.0+0na.246d066 when it should be 3007.1+410.g246d066457
-                ## DGM disabling for now
-                ## DGM if git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
+                ## Shallow cloning is resulting in the wrong version of Salt, even with a depth of 5
+                ## getting 3007.0+0na.246d066 when it should be 3007.1+410.g246d066457, disabling for now
+                ## if git clone --depth 1 --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
                 echodebug "git command, git clone --branch $GIT_REV $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
                 if git clone --branch "$GIT_REV" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
                     # shellcheck disable=SC2164
@@ -2743,6 +2741,7 @@ EOM
     echoinfo "Installing Built Salt Wheel"
     ${_pip_cmd} uninstall --yes ${_USE_BREAK_SYSTEM_PACKAGES} salt 2>/dev/null || true
 
+    # Hack for getting current Arch working with git-master
     if [ "${DISTRO_NAME}"  = "Arch Linux" ]; then
         _arch_dep="cryptography==42.0.7"    # debug matching current Arch version of python-cryptography
         echodebug "Running '${_pip_cmd} install --force-reinstall --break-system-packages ${_arch_dep}'"

From f7eae7c3fac926921dde9b9e406124bb7d1467d4 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 13:49:17 -0600
Subject: [PATCH 16/27] Fix typo

---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d2aab1708..123ebfcca 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2111,7 +2111,7 @@ __git_clone_and_checkout() {
                     # shellcheck disable=SC2164
                     cd "${_SALT_GIT_CHECKOUT_DIR}"
                     __SHALLOW_CLONE=$BS_TRUE
-                    echoinfo  "shallow git cloned $GIT_REV, version $(python3 salt/version.py)"
+                    echoinfo  "shallow path (disabled shallow) git cloned $GIT_REV, version $(python3 salt/version.py)"
                 else
                     # Shallow clone above failed(missing upstream tags???), let's resume the old behaviour.
                     echowarn "Failed to shallow clone."
@@ -2125,7 +2125,7 @@ __git_clone_and_checkout() {
         fi
 
         if [ "$__SHALLOW_CLONE" -eq $BS_FALSE ]; then
-            echodebug "shadow clone false, BS_FALSE $BS_FALSE, git clone $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
+            echodebug "shallow clone false, BS_FALSE $BS_FALSE, git clone $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
             git clone "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME" || return 1
             # shellcheck disable=SC2164
             cd "${_SALT_GIT_CHECKOUT_DIR}"

From 27198d2b9134a31319b3478c1943f646b2e7d0f2 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 14:27:39 -0600
Subject: [PATCH 17/27] Reset _PIP_INSTALL_ARGS to empty for Alpine, similar to
 Ubuntu and Debian

---
 bootstrap-salt.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 123ebfcca..2191beb29 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5161,6 +5161,7 @@ install_cloud_linux_check_services() {
 #   Alpine Linux Install Functions
 #
 install_alpine_linux_stable_deps() {
+    _PIP_INSTALL_ARGS=""
     if ! grep -q '^[^#].\+alpine/.\+/community' /etc/apk/repositories; then
         # Add community repository entry based on the "main" repo URL
         __REPO=$(grep '^[^#].\+alpine/.\+/main\>' /etc/apk/repositories)
@@ -5179,6 +5180,7 @@ install_alpine_linux_stable_deps() {
 }
 
 install_alpine_linux_git_deps() {
+    _PIP_INSTALL_ARGS=""
     install_alpine_linux_stable_deps || return 1
 
     if ! __check_command_exists git; then
@@ -5194,6 +5196,7 @@ install_alpine_linux_git_deps() {
 
 install_alpine_linux_stable() {
     __PACKAGES="salt"
+    _PIP_INSTALL_ARGS=""
 
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ];then
         __PACKAGES="${__PACKAGES} salt-cloud"
@@ -5218,11 +5221,13 @@ install_alpine_linux_stable() {
 }
 
 install_alpine_linux_git() {
+    _PIP_INSTALL_ARGS=""
      __install_salt_from_repo "${_PY_EXE}" || return 1
     return 0
 }
 
 install_alpine_linux_post() {
+    _PIP_INSTALL_ARGS=""
     for fname in api master minion syndic; do
         # Skip if not meant to be installed
         [ $fname = "api" ] && \
@@ -5252,6 +5257,7 @@ install_alpine_linux_post() {
 }
 
 install_alpine_linux_restart_daemons() {
+    _PIP_INSTALL_ARGS=""
     [ "${_START_DAEMONS}" -eq $BS_FALSE ] && return
 
     for fname in api master minion syndic; do
@@ -5270,6 +5276,7 @@ install_alpine_linux_restart_daemons() {
 }
 
 install_alpine_linux_check_services() {
+    _PIP_INSTALL_ARGS=""
     for fname in api master minion syndic; do
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
@@ -5286,6 +5293,7 @@ install_alpine_linux_check_services() {
 }
 
 daemons_running_alpine_linux() {
+    _PIP_INSTALL_ARGS=""
     [ "${_START_DAEMONS}" -eq $BS_FALSE ] && return
 
     FAILED_DAEMONS=0

From 09a36c52cad1e0d454f37446ca90ef78aef8e6fd Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 14:47:57 -0600
Subject: [PATCH 18/27] Updated script date

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2191beb29..bd2cfc49e 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2024.07.23"
+__ScriptVersion="2024.09.20"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"

From 681fd9a2db3241c0d3191f8aa7c210043eb7cc19 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Mon, 23 Sep 2024 17:12:15 +0000
Subject: [PATCH 19/27] Update develop branch for the v2024.09.23 release

---
 CHANGELOG.md       | 10 ++++++++++
 bootstrap-salt.ps1 |  2 +-
 bootstrap-salt.sh  |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1cb05914..ff404020f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v2024.09.23
+
+## What's Changed
+
+- Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
+- Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
+- Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.23...v2024.09.23
+
 # v2024.07.23
 
 ## What's Changed
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 106e75ba3..6bd3d7e5a 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -110,7 +110,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2024.07.23"
+$__ScriptVersion = "2024.09.23"
 $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 bd2cfc49e..6e96aa239 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2024.09.20"
+__ScriptVersion="2024.09.23"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"

From ffaa18e7ae8f2672ce591a714b5efcd1ce62bec4 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 23 Sep 2024 11:31:30 -0600
Subject: [PATCH 20/27] Updated deprecated versions for actions for upload,
 download, checkout, etc

---
 .github/workflows/nightly.yml |  2 +-
 .github/workflows/release.yml | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d04378611..bfdb47b13 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -54,7 +54,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a18b485a..2fed84540 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,7 +63,7 @@ jobs:
     outputs:
       release-version: ${{ steps.update-repo.outputs.release-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: develop
           repository: ${{ github.repository }}
@@ -139,7 +139,7 @@ jobs:
           repository: ${{ github.repository }}
 
       - name: Upload Release Details
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-details
           path: |
@@ -158,7 +158,7 @@ jobs:
     permissions:
       contents: write  # To be able to publish the release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -205,7 +205,7 @@ jobs:
           git config --global commit.gpgsign true
 
       - name: Download Release Details
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: release-details
 
@@ -254,13 +254,13 @@ jobs:
     permissions:
       contents: write  # To be able to publish the release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
           ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
       - name: Download Release Details
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: release-details
 
@@ -287,7 +287,7 @@ jobs:
             LICENSE
 
       - name: Delete Release Details Artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: release-details
           failOnError: false
@@ -303,7 +303,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -367,7 +367,7 @@ jobs:
       pull-requests: write  # For action peter-evans/create-pull-request
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -378,7 +378,7 @@ jobs:
           echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
           echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: develop
           repository: ${{ github.repository }}

From 8d0aca6ab713c74f6ca704dfd6a8f2363e7e4db8 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Mon, 23 Sep 2024 19:25:27 +0000
Subject: [PATCH 21/27] Update develop branch for the v2024.09.23 release

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff404020f..a25cc9681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## What's Changed
 
+- Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
+- Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
+- Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019
+- Updated deprecated versions for actions for upload, download, checkout for release by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2020
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.23...v2024.09.23
+
+# v2024.09.23
+
+## What's Changed
+
 - Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
 - Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
 - Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019

From b2a38085d17be5b9f9fb6f84f7dececd8e835bea Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 23 Sep 2024 14:01:50 -0600
Subject: [PATCH 22/27] Further action updates

---
 .github/workflows/ci.yml           | 2 +-
 .github/workflows/release.yml      | 2 ++
 .github/workflows/templates/ci.yml | 2 +-
 .github/workflows/test-linux.yml   | 4 ++--
 .github/workflows/test-macos.yml   | 4 ++--
 .github/workflows/test-windows.yml | 6 +++---
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc416fed5..addd6fc46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2fed84540..aeb362715 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -145,6 +145,7 @@ jobs:
           path: |
             .cut_release_version
             .cut_release_changes
+          include-hidden-files: true
 
   merge-develop-into-stable:
     name: Merge develop into stable
@@ -259,6 +260,7 @@ jobs:
           ref: stable
           repository: ${{ github.repository }}
           ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
+
       - name: Download Release Details
         uses: actions/download-artifact@v4
         with:
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index c733ffe83..633a10440 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.github/workflows/templates/ci.yml
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 6c74df823..6b0c7a3e0 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -45,7 +45,7 @@ jobs:
           bundler-cache: true
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -79,7 +79,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 2590a73de..ba5dbb74a 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -52,7 +52,7 @@ jobs:
           bundler-cache: true
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -86,7 +86,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 09eda400b..0d0b5b9c1 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -45,7 +45,7 @@ jobs:
         instance: ${{ fromJSON(inputs.instances) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -81,7 +81,7 @@ jobs:
           env
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -115,7 +115,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus

From 12e5a8d80c5cdb0129bc64dd8805c73e86a9954e Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 23 Sep 2024 14:29:59 -0600
Subject: [PATCH 23/27] Further fixes for exitstatus

---
 .github/workflows/ci.yml           | 12 +++++++++---
 .github/workflows/templates/ci.yml | 12 +++++++++---
 .github/workflows/test-linux.yml   |  4 +++-
 .github/workflows/test-macos.yml   |  4 +++-
 .github/workflows/test-windows.yml |  4 +++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index addd6fc46..34613b591 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -87,7 +89,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
 
   lint:
     name: Lint
@@ -112,7 +116,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
 
 
 
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index 633a10440..14efc1ccf 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.github/workflows/templates/ci.yml
@@ -50,7 +50,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -87,7 +89,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
 
   lint:
     name: Lint
@@ -112,4 +116,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 6b0c7a3e0..376552f9a 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -82,4 +82,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index ba5dbb74a..a61a922bb 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -89,4 +89,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 0d0b5b9c1..5489cc244 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -118,4 +118,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/*
+          retention-days: 7
+          if-no-files-found: error

From d67a79b3cbc2aa7b9e2bafe7704b7433569f38b2 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 23 Sep 2024 15:04:33 -0600
Subject: [PATCH 24/27] Revert exitstatus changes for test OS yml files

---
 .github/workflows/test-linux.yml   | 4 +---
 .github/workflows/test-macos.yml   | 4 +---
 .github/workflows/test-windows.yml | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 376552f9a..6b0c7a3e0 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -82,6 +82,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index a61a922bb..ba5dbb74a 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -89,6 +89,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 5489cc244..0d0b5b9c1 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -118,6 +118,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus

From 48a22b17226d7fe7549e9cc983cfa8c5082aff24 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 23 Sep 2024 15:36:32 -0600
Subject: [PATCH 25/27] Another attempt to resolve duplicate exitstatus
 detection

---
 .github/workflows/ci.yml                | 14 ++++----------
 .github/workflows/templates/ci-tail.yml |  2 +-
 .github/workflows/templates/ci.yml      | 12 +++---------
 .github/workflows/test-linux.yml        |  2 +-
 .github/workflows/test-macos.yml        |  2 +-
 .github/workflows/test-windows.yml      |  2 +-
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34613b591..25e683b32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,9 +50,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus/
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -89,9 +87,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus/
 
   lint:
     name: Lint
@@ -116,9 +112,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus/
 
 
 
@@ -519,7 +513,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/
 
       - name: Delete Exit Status Artifacts
         if: always()
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index 712f5169e..0a9f84ac6 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -14,7 +14,7 @@
         uses: actions/download-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/
 
       - name: Delete Exit Status Artifacts
         if: always()
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index 14efc1ccf..abf154a41 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.github/workflows/templates/ci.yml
@@ -50,9 +50,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus/
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -89,9 +87,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus/
 
   lint:
     name: Lint
@@ -116,6 +112,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus/*
-          retention-days: 7
-          if-no-files-found: error
+          path: exitstatus/
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 6b0c7a3e0..c63ede2b5 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -82,4 +82,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index ba5dbb74a..494c4eda9 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -89,4 +89,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 0d0b5b9c1..49c402950 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -118,4 +118,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: exitstatus
-          path: exitstatus
+          path: exitstatus/

From 3d58d55fba3977a06f383b862bd1442c1532afe6 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 24 Sep 2024 13:50:01 -0600
Subject: [PATCH 26/27] Converted name exitstatus to pattern usage

---
 .github/workflows/ci.yml                | 11 ++++++-----
 .github/workflows/templates/ci-tail.yml |  5 +++--
 .github/workflows/templates/ci.yml      |  6 +++---
 .github/workflows/test-linux.yml        |  2 +-
 .github/workflows/test-macos.yml        |  2 +-
 .github/workflows/test-windows.yml      |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25e683b32..c13c6fffe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   generate-actions-workflow:
@@ -86,7 +86,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   lint:
@@ -111,7 +111,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
 
@@ -512,14 +512,15 @@ jobs:
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
           path: exitstatus/
+          pattern: exitstatus-*
+          merge-multiple: true
 
       - name: Delete Exit Status Artifacts
         if: always()
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: exitstatus
+          pattern: exitstatus-*
           failOnError: false
 
       - name: Set Pipeline Exit Status
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index 0a9f84ac6..f6a843cbb 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -13,14 +13,15 @@
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
           path: exitstatus/
+          pattern: exitstatus-*
+          merge-multiple: true
 
       - name: Delete Exit Status Artifacts
         if: always()
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: exitstatus
+          pattern: exitstatus-*
           failOnError: false
 
       - name: Set Pipeline Exit Status
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index abf154a41..e9c6be7b9 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.github/workflows/templates/ci.yml
@@ -49,7 +49,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   generate-actions-workflow:
@@ -86,7 +86,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   lint:
@@ -111,5 +111,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index c63ede2b5..c15a5bc30 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -81,5 +81,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
           path: exitstatus/
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 494c4eda9..ccabff32a 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -88,5 +88,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
           path: exitstatus/
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 49c402950..25d300ce8 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -117,5 +117,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
           path: exitstatus/

From 8da07641633a31699d5887e30f253be5ab7ca53f Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 24 Sep 2024 21:39:51 +0000
Subject: [PATCH 27/27] Update develop branch for the v2024.09.24 release

---
 CHANGELOG.md       | 12 ++++++++++++
 bootstrap-salt.ps1 |  2 +-
 bootstrap-salt.sh  |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a25cc9681..33ee81d93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v2024.09.24
+
+## What's Changed
+
+- Add KDE neon to list of Ubuntu derivates (again) by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/2016
+- Debugging build failures on Arch, Fedora and Tumbleweed by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2018
+- Reset \_PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2019
+- Updated deprecated versions for actions for upload, download, checkout for release by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2020
+- Further action updates by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2021
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.23...v2024.09.24
+
 # v2024.09.23
 
 ## What's Changed
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 6bd3d7e5a..eccbb3526 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -110,7 +110,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2024.09.23"
+$__ScriptVersion = "2024.09.24"
 $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 6e96aa239..4c6b289bb 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2024.09.23"
+__ScriptVersion="2024.09.24"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"