Prepend the salt package version with 1: on deb-based distros

.github/workflows/ci.yml

@@ -249,10 +249,12 @@ jobs:
         with:
           salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
 
+      # TODO: Remove the --salt_version argument post 3006 release.  This was to handle versioning
+      # issues on pre-3006 development versions on deb-based distros.
       - name: Update Debian changelog
         shell: bash
         run: |
-          tools changelog update-deb --draft
+          tools changelog update-deb --draft --salt_version="1:${{ needs.prepare-workflow.outputs.salt-version }}"
           tools changelog update-deb
 
       - name: Update RPM changelog
@@ -606,7 +608,7 @@ jobs:
 
   macos-12-pkg-tests:
     name: macOS 12 Package Tests
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.jobs)['github-hosted-runners'] }}
     needs:
       - prepare-workflow
       - build-pkgs

.github/workflows/nightly.yml

@@ -247,10 +247,12 @@ jobs:
         with:
           salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
 
+      # TODO: Remove the --salt_version argument post 3006 release.  This was to handle versioning
+      # issues on pre-3006 development versions on deb-based distros.
       - name: Update Debian changelog
         shell: bash
         run: |
-          tools changelog update-deb --draft
+          tools changelog update-deb --draft --salt_version="1:${{ needs.prepare-workflow.outputs.salt-version }}"
           tools changelog update-deb
 
       - name: Update RPM changelog

.github/workflows/scheduled.yml

@@ -247,10 +247,12 @@ jobs:
         with:
           salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
 
+      # TODO: Remove the --salt_version argument post 3006 release.  This was to handle versioning
+      # issues on pre-3006 development versions on deb-based distros.
       - name: Update Debian changelog
         shell: bash
         run: |
-          tools changelog update-deb --draft
+          tools changelog update-deb --draft --salt_version="1:${{ needs.prepare-workflow.outputs.salt-version }}"
           tools changelog update-deb
 
       - name: Update RPM changelog

.github/workflows/templates/ci.yml.jinja

@@ -98,10 +98,12 @@ on:
           release: true
           <%- endif %>
 
+      # TODO: Remove the --salt_version argument post 3006 release.  This was to handle versioning
+      # issues on pre-3006 development versions on deb-based distros.
       - name: Update Debian changelog
         shell: bash
         run: |
-          tools changelog update-deb --draft
+          tools changelog update-deb --draft --salt_version="1:${{ needs.prepare-workflow.outputs.salt-version }}"
           tools changelog update-deb
 
       - name: Update RPM changelog

pkg/tests/conftest.py

@@ -35,6 +35,10 @@ def version():
         if _version:
             _version = _version.groups()[0].replace("_", "-").replace("~", "")
             _version = _version.split("-")[0]
+            # TODO: Remove this clause.  This is to handle a versioning difficulty between pre-3006
+            # dev versions and older salt versions on deb-based distros
+            if _version.startswith("1:"):
+                _version = _version[2:]
             break
     return _version