Merge develop into stable for v2024.09.24 release

saltstack · Sep 24, 2024 · 6f4ed89 · 6f4ed89
2 parents 5e3c4e2 + 8da0764
commit 6f4ed89
Show file tree

Hide file tree

Showing 14 changed files with 141 additions and 84 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,8 +49,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -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"
 
@@ -86,8 +86,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   lint:
     name: Lint
@@ -111,8 +111,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
 
 
@@ -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
@@ -527,14 +512,15 @@ jobs:
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
-          path: 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/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
@@ -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,12 +139,13 @@ jobs:
           repository: ${{ github.repository }}
 
       - name: Upload Release Details
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-details
           path: |
             .cut_release_version
             .cut_release_changes
+          include-hidden-files: true
 
   merge-develop-into-stable:
     name: Merge develop into stable
@@ -158,7 +159,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 +206,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 +255,14 @@ 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 +289,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 +305,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -367,7 +369,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 +380,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 }}

diff --git 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
+          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
@@ -49,8 +49,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -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"
 
@@ -86,8 +86,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   lint:
     name: Lint
@@ -111,5 +111,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
diff --git 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,29 +99,30 @@
     "ubuntu-2404",
 ]
 
+##    "opensuse-tumbleweed",
 BLACKLIST_3006 = [
     "arch",
     "debian-12",
     "fedora-40",
     "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/.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
+          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
@@ -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
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
+          path: exitstatus/