Merge develop into stable for v2025.09.03 release

Author: saltbot-open

.github/workflows/test-windows.yml

@@ -59,7 +59,8 @@ jobs:
         run: |
           # We need to get the version here and make it an environment variable
           # It is used to install via bootstrap and in the test
-          # The version is in the instance name
+          # The version is in the instance name:
+          # ["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]
           $instance = "${{ matrix.instance }}"
           $version = $instance -split "-",2
           if ( $version.Count -gt 1 ) {

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 minimum_pre_commit_version: 1.15.2
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-merge-conflict  # Check for files that contain merge conflict strings.
       - id: trailing-whitespace   # Trims trailing whitespace.

AUTHORS.rst

@@ -31,7 +31,7 @@ Ashok Raja R                ashokrajar             [email protected]
 Beau Hargis                 beaucephus             [email protected]
 Benjamin Drung              bdrung                 [email protected]
 BlaineAtAffirmOnceMore      BlaineAtAffirm
-Boris Feld                  Lothiraldan
+Boris Feld                  Lothiraldan            [email protected]
 Brad Thurber                bradthurber
 Brandon Clifford            brandon099             [email protected]
 Bret Fisher                 BretFisher             [email protected]
@@ -60,14 +60,16 @@ Denys Havrysh               vutny                  [email protected]
 deployboy                   deployboy
 Diego Woitasen              diegows                [email protected]
 Dmitry Kuzmenko             DmitryKuzmenko         [email protected]
+Ed Silva                    edlitmus               [email protected]
 EHJ-52n                     EHJ-52n                [email protected]
 ek9                         ek9
-Elias Probst                eliasp
+Elias Probst                eliasp                 [email protected]
 eliezerlp                   eliezerlp
 Emiel Kollof                ekollof
 Eric Radman                 eradman                [email protected]
 Erik Ankrom                 erikankrom
 Erik Johnson                terminalmage           [email protected]
+Erwin Dondorp               erwindon               [email protected]
 EYJ                         eyj
 Felippe Burk                felippeb
 fizmat                      fizmat
@@ -170,7 +172,7 @@ Sam                         sticky-note            [email protected]
 Sebastian Wendel            sourceindex
 Sebastien Blaisot           sblaisot
 Sergey Paramonov            serge-p                [email protected]
-Shane Lee                   twangboy               slee@saltstack.com
+Shane Lee                   twangboy               shane.lee@broadcom.com
 Shawn Butts                 shawnbutts
 Skyler Berg                 skylerberg             [email protected]
 Stanislav B                 stanislavb

CHANGELOG.md

@@ -1,3 +1,28 @@
+# v2025.09.03
+
+## What's Changed
+
+- fixes for Photon4/5 by @erwindon in https://github.com/saltstack/salt-bootstrap/pull/2080
+- Get versions correctly by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2081
+- Prep release by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2082
+- Add support for specifying a directory other than /tmp for installation execution by @edlitmus in https://github.com/saltstack/salt-bootstrap/pull/2068
+- Add another PR and a few more emails by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2083
+
+## New Contributors
+
+- @erwindon made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/2080
+- @edlitmus made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/2068
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2025.02.24...v2025.09.03
+
+# v2025.09.03
+
+## What's Changed
+
+- Fixed installation on Photon 4 and Photon 5 by @erwindon in https://github.com/saltstack/salt-bootstrap/pull/2080
+- Properly handle 2 digit minor versions of Salt by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2081
+- Added an option to specify something other than `/tmp` for installation execution by @edlitmus in https://github.com/saltstack/salt-bootstrap/pull/2068
+
 # v2025.02.24
 
 ## What's Changed

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:
 
+- 2025.02.24: ``a0e3a58fc6358a7c6f708ee4910229e72fbdab7161819514b0696146a2edb62d``
 - 2024.12.12: ``7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd``
 - 2024.12.09: ``44f9405a6d9622ad8fa7c93e83a52e01ca328f27e4e9dea4a52268c6a22dbe6d``
 - 2024.11.29: ``0ac87384dee051aceded69704485a5de0e4a308551a462b10c262111b57acff0``
@@ -198,6 +199,9 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a
     -r  Disable all repository configuration performed by this script. This
         option assumes all necessary repository configuration is already present
         on the system.
+    -T  If set this overrides the use of /tmp for script execution. This is
+        to allow for systems in which noexec is applied to temp filesystem mounts
+        for security reasons
     -U  If set, fully upgrade the system prior to bootstrapping Salt
     -v  Display script version
     -V  Install Salt into virtualenv

bootstrap-salt.ps1

@@ -108,7 +108,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2025.02.24"
+$__ScriptVersion = "2025.09.03"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements
@@ -207,25 +207,36 @@ function Get-AvailableVersions {
         Write-Verbose "- $_"
     }
 
-    # Get the latest version, should be the last in the list
-    Write-Verbose "Getting latest available version"
-    $latest = $available_versions | Select-Object -Last 1
-    Write-Verbose "Latest available version: $latest"
-
     # Create a versions table
     # This will have the latest version available, the latest version available
     # for each major version, and every version available. This makes the
     # version lookup logic easier. The contents of the versions table can be
     # found by running -Verbose
     Write-Verbose "Populating the versions table"
-    $versions_table = [ordered]@{"latest"=$latest}
+    $versions_table = [ordered]@{}
     $available_versions | ForEach-Object {
-        $versions_table[$(Get-MajorVersion $_)] = $_
+        $major_version = $(Get-MajorVersion $_)
+        if ( $versions_table.Keys -contains $major_version ) {
+            if ( [System.Version]$_ -gt [System.Version]$versions_table[$major_version] ) {
+                $versions_table[$major_version] = $_
+            }
+        } else {
+            $versions_table[$major_version] = $_
+        }
+
+        if ( $versions_table -contains "latest" ) {
+            if ( [System.Version]$_ -gt [System.Version]$versions_table["latest"] ) {
+                $versions_table["latest"] = $_
+            }
+        } else {
+            $versions_table["latest"] = $_
+        }
+
         $versions_table[$_.ToLower()] = $_.ToLower()
     }
 
     Write-Verbose "Versions Table:"
-    $versions_table | Sort-Object Name | Out-String | ForEach-Object {
+    $versions_table.GetEnumerator() | Sort-Object Name | Out-String | ForEach-Object {
         Write-Verbose "$_"
     }