Merge branch 'develop' into develop

.github/workflows/ci.yml

@@ -93,7 +93,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    container: koalaman/shellcheck-alpine:v0.6.0
+    container: koalaman/shellcheck-alpine:v0.7.0
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v3
@@ -252,6 +252,20 @@ jobs:
       instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
 
 
+  almalinux-9:
+    name: AlmaLinux 9
+    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: almalinux-9
+      display-name: AlmaLinux 9
+      timeout: 20
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
+
+
   amazon-2:
     name: Amazon 2
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -308,6 +322,20 @@ jobs:
       instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
 
 
+  centos-stream9:
+    name: CentOS Stream 9
+    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: centos-stream9
+      display-name: CentOS Stream 9
+      timeout: 20
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
+
+
   debian-10:
     name: Debian 10
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -549,10 +577,12 @@ jobs:
       - windows-2019
       - windows-2022
       - almalinux-8
+      - almalinux-9
       - amazon-2
       - arch
       - centos-7
       - centos-stream8
+      - centos-stream9
       - debian-10
       - debian-11
       - fedora-35

.github/workflows/templates/ci.yml

@@ -93,7 +93,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    container: koalaman/shellcheck-alpine:v0.6.0
+    container: koalaman/shellcheck-alpine:v0.7.0
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v3

.github/workflows/templates/generate.py

@@ -9,10 +9,12 @@
 
 LINUX_DISTROS = [
     "almalinux-8",
+    "almalinux-9",
     "amazon-2",
     "arch",
     "centos-7",
     "centos-stream8",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "fedora-35",
@@ -72,9 +74,11 @@
 
 ONEDIR_DISTROS = [
     "almalinux-8",
+    "almalinux-9",
     "amazon-2",
     "centos-7",
     "centos-stream8",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "oraclelinux-7",
@@ -86,7 +90,9 @@
 ]
 
 BLACKLIST_3003 = [
+    "almalinux-9",
     "arch",
+    "centos-stream9",
     "debian-11",
     "fedora-35",
     "fedora-36",
@@ -101,8 +107,10 @@
 ]
 
 BLACKLIST_GIT_3003 = [
+    "almalinux-9",
     "amazon-2",
     "arch",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "fedora-35",
@@ -120,7 +128,9 @@
 ]
 
 BLACKLIST_3004 = [
+    "almalinux-9",
     "arch",
+    "centos-stream9",
     "fedora-35",
     "fedora-36",
     "fedora-37",
@@ -144,8 +154,10 @@
 ]
 
 BLACKLIST_GIT_3004 = [
+    "almalinux-9",
     "amazon-2",
     "arch",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "fedora-35",
@@ -225,14 +237,19 @@
     "fedora-38",
 ]
 
-LATEST_PKG_BLACKLIST = []
+LATEST_PKG_BLACKLIST = [
+    "almalinux-9",
+    "centos-stream9",
+]
 
 DISTRO_DISPLAY_NAMES = {
     "almalinux-8": "AlmaLinux 8",
+    "almalinux-9": "AlmaLinux 9",
     "amazon-2": "Amazon 2",
     "arch": "Arch",
     "centos-7": "CentOS 7",
     "centos-stream8": "CentOS Stream 8",
+    "centos-stream9": "CentOS Stream 9",
     "debian-10": "Debian 10",
     "debian-11": "Debian 11",
     "fedora-35": "Fedora 35",

README.rst

@@ -397,12 +397,16 @@ Using ``PowerShell`` to install latest stable version:
 
 .. code:: console
 
-  New-Item -ItemType Directory -Force -Path C:\Temp
-  Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile C:\Temp\bootstrap-salt.ps1
+  Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile $env:TEMP\bootstrap-salt.ps1
   Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
-  C:\Temp\bootstrap-salt.ps1
+  & $env:TEMP\bootstrap-salt.ps1
   Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser
 
+Display information about the install script parameters:
+
+.. code:: console
+
+  help $env:TEMP\bootstrap-salt.ps1 -Detailed
 
 Using ``cygwin`` to install latest stable version:
 

bootstrap-salt.ps1

@@ -65,10 +65,10 @@
     version. The architecture is dynamically determined by the script.
 
 .LINK
-    Bootstrap GitHub Project (script home) - https://github.com/saltstack/salt-windows-bootstrap
-    Original Vagrant Provisioner Project -https://github.com/saltstack/salty-vagrant
+    Salt Bootstrap GitHub Project (script home) - https://github.com/saltstack/salt-bootstrap
+    Original Vagrant Provisioner Project - https://github.com/saltstack/salty-vagrant
     Vagrant Project (utilizes this script) - https://github.com/mitchellh/vagrant
-    SaltStack Download Location - https://repo.saltproject.io/windows/
+    Salt Download Location - https://repo.saltproject.io/windows/
 #>
 
 #===============================================================================