HS-63630: fix up salt release for Cloudian

.github/actions/setup-pre-commit/action.yml

@@ -17,24 +17,10 @@ runs:
 
   steps:
 
-    - uses: ./.github/actions/cached-virtualenv
-      id: pre-commit-virtualenv
-      with:
-        name: pre-commit
-        cache-seed: ${{ inputs.cache-seed }}
-
     - name: Install Pre-Commit
-      if: ${{ steps.pre-commit-virtualenv.outputs.cache-hit != 'true' }}
       shell: bash
       run: |
-        ${{ steps.pre-commit-virtualenv.outputs.python-executable }} -m pip install pre-commit==${{ inputs.version }}
-
-    - name: Cache Pre-Commit Hooks
-      uses: ./.github/actions/cache
-      id: pre-commit-hooks-cache
-      with:
-        key: ${{ steps.pre-commit-virtualenv.outputs.cache-key }}|${{ inputs.version }}|${{ hashFiles('.pre-commit-config.yaml') }}
-        path: ~/.cache/pre-commit
+        pip install pre-commit==${{ inputs.version }}
 
     - name: Install Pre-Commit Hooks
       shell: bash

.github/workflows/build-deps-ci-action.yml

@@ -51,6 +51,7 @@ on:
 
 env:
   COLUMNS: 190
+  RELENV_DATA: "${{ github.workspace }}/.relenv"
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
   PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
@@ -157,7 +158,7 @@ jobs:
 
   macos-dependencies:
     name: MacOS
-    runs-on: ${{ matrix.arch == 'x86_64' && 'macos-13' || 'macos-14' }}
+    runs-on: ${{ matrix.arch == 'x86_64' && 'macos-15-intel' || 'macos-14' }}
     if: ${{ toJSON(fromJSON(inputs.matrix)['macos']) != '[]' }}
     timeout-minutes: 90
     strategy:

.github/workflows/build-docs.yml

@@ -33,6 +33,7 @@ jobs:
          # - linkcheck
          # - spellcheck
           - html
+          - man
 
     steps:
       - uses: actions/checkout@v4
@@ -95,7 +96,6 @@ jobs:
           tools docs ${{ matrix.docs-output }}
 
       - name: Upload Built Documentation Artifact(${{ matrix.docs-output }})
-        if: ${{ steps.build-docs.outputs.has-artifacts == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.build-docs.outputs.artifact-name }}

.github/workflows/build-packages.yml

@@ -66,7 +66,7 @@ jobs:
 
   build-deb-packages:
     name: DEB
-    if: ${{ false }}
+    if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
     runs-on:
       - ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || inputs.linux_arm_runner }}
     strategy:
@@ -75,7 +75,10 @@ jobs:
         include: ${{ fromJSON(inputs.matrix)['linux'] }}
 
     container:
-      image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12
+      image: ghcr.io/saltstack/salt-ci-containers/testing:debian-13
+
+    env:
+      RELENV_DATA: "${{ github.workspace }}/.relenv"
 
     steps:
       # Checkout here so we can easily use custom actions
@@ -88,6 +91,15 @@ jobs:
           path:
             pkgs/checkout/
 
+      - name: Install build dependencies
+        run: |
+          # Installing python3.13-venv for Python 3.13 support
+          apt-get install -y python3.13-venv
+          # Installing devscripts for source package builds (provides debuild)
+          apt-get install -y devscripts
+          # Installing patchelf for relenv ELF binary patching
+          apt-get install -y patchelf
+
       - name: Download Onedir Tarball as an Artifact
         if:  inputs.source == 'onedir'
         uses: actions/download-artifact@v4
@@ -100,7 +112,7 @@ jobs:
         run: |
           mkdir -p ~/.local/relenv
           python3 -m venv venv
-          venv/bin/python3 -m pip install relenv ppbt
+          venv/bin/python3 -m pip install ppbt relenv==${{ inputs.relenv-version }}
           venv/bin/python3 -c 'from relenv import common; common.get_toolchain()'
 
       - name: Download Release Patch
@@ -110,6 +122,12 @@ jobs:
           name: salt-${{ inputs.salt-version }}.patch
           path: pkgs/checkout/
 
+      - name: Download MAN Pages
+        uses: actions/download-artifact@v4
+        with:
+          name: man-pages-${{ inputs.salt-version }}
+          path: pkgs/checkout/doc/man/
+
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
@@ -178,11 +196,18 @@ jobs:
         include: ${{ fromJSON(inputs.matrix)['linux'] }}
 
     container:
-      image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
+      image: ghcr.io/saltstack/salt-ci-containers/testing:fedora-42
+
+    env:
+      RELENV_DATA: "${{ github.workspace }}/.relenv"
 
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install rpmsign
+        run: |
+          dnf install -y rpmsign
+
       - name: Download Onedir Tarball as an Artifact
         if:  inputs.source == 'onedir'
         uses: actions/download-artifact@v4
@@ -195,7 +220,7 @@ jobs:
         run: |
           mkdir -p ~/.local/relenv
           python3 -m venv venv
-          venv/bin/python3 -m pip install relenv ppbt
+          venv/bin/python3 -m pip install ppbt relenv==${{ inputs.relenv-version }}
           venv/bin/python3 -c 'from relenv import common; common.get_toolchain()'
 
       - name: Download Release Patch
@@ -204,6 +229,12 @@ jobs:
         with:
           name: salt-${{ inputs.salt-version }}.patch
 
+      - name: Download MAN Pages
+        uses: actions/download-artifact@v4
+        with:
+          name: man-pages-${{ inputs.salt-version }}
+          path: doc/man/
+
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
@@ -257,9 +288,9 @@ jobs:
         id: set-artifact-name
         run: |
           if [ "${{ inputs.source }}" != "src" ]; then
-            echo "artifact-name=cloudian-salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm" >> "$GITHUB_OUTPUT"
+            echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm" >> "$GITHUB_OUTPUT"
           else
-            echo "artifact-name=cloudian-salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm-from-src" >> "$GITHUB_OUTPUT"
+            echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm-from-src" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Upload RPMs
@@ -281,7 +312,7 @@ jobs:
     env:
       PIP_INDEX_URL: https://pypi.org/simple
     runs-on:
-      - ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-13' }}
+      - ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-15-intel' }}
 
     steps:
       - name: Check Package Signing Enabled
@@ -330,6 +361,12 @@ jobs:
           name: salt-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
           path: artifacts/
 
+      - name: Download MAN Pages
+        uses: actions/download-artifact@v4
+        with:
+          name: man-pages-${{ inputs.salt-version }}
+          path: doc/man/
+
       - name: Setup Keychain
         if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
         env:
@@ -481,6 +518,12 @@ jobs:
           name: salt-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.zip
           path: artifacts/
 
+      - name: Download MAN Pages
+        uses: actions/download-artifact@v4
+        with:
+          name: man-pages-${{ inputs.salt-version }}
+          path: doc/man/
+
       - name: Setup Certificate
         if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
         shell: bash
@@ -489,7 +532,7 @@ jobs:
 
       - name: Code signing with Software Trust Manager
         if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
-        uses: digicert/ssm-code-signing@v0.0.2
+        uses: digicert/ssm-code-signing@v1.1.1
 
       - name: Build Windows Packages
         run: |

.github/workflows/build-salt-onedir.yml

@@ -109,7 +109,7 @@ jobs:
       matrix:
         include: ${{ fromJSON(inputs.matrix)['macos'] }}
     runs-on:
-      - ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-13' }}
+      - ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-15-intel' }}
     env:
       PIP_INDEX_URL: https://pypi.org/simple
       USE_S3_CACHE: 'false'