Merge branch 'master' into remove_payload_Serial

cmcmarrow · Aug 8, 2023 · 4c23f43 · 4c23f43
2 parents cbc40b7 + 7ec90b0
commit 4c23f43
Show file tree

Hide file tree

Showing 253 changed files with 7,599 additions and 4,088 deletions.
diff --git a/.github/actions/get-pull-labels/action.yml b/.github/actions/get-pull-labels/action.yml
diff --git a/.github/actions/get-pull-number/action.yml b/.github/actions/get-pull-number/action.yml
diff --git a/.github/actions/get-pull-request/action.yml b/.github/actions/get-pull-request/action.yml
diff --git a/.github/actions/setup-python-tools-scripts/action.yml b/.github/actions/setup-python-tools-scripts/action.yml
@@ -33,7 +33,12 @@ runs:
       shell: bash
       working-directory: ${{ inputs.cwd }}
       run: |
-        python3 -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
+        (python3 -m pip install --help | grep break-system-packages > /dev/null 2>&1) && exitcode=0 || exitcode=1
+        if [ $exitcode -eq 0 ]; then
+          python3 -m pip install --break-system-packages -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
+        else
+          python3 -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
+        fi
 
     - name: Get 'python-tools-scripts' Version
       id: get-version

diff --git a/.github/actions/setup-relenv/action.yml b/.github/actions/setup-relenv/action.yml
@@ -22,7 +22,7 @@ inputs:
     required: false
     type: string
     description: The version of relenv to use
-    default: 0.12.3
+    default: 0.13.2
 
 outputs:
   version:

diff --git a/.github/config.yml b/.github/config.yml
@@ -13,7 +13,7 @@ newIssueWelcomeComment: >
 
     - [Community Wiki](https://github.com/saltstack/community/wiki)
     - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
-    - [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg)
+    - [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-1zlfxffs1-NuEH~G9TzOeuNGdsfZIl3w)
     - [IRC on LiberaChat](https://web.libera.chat/#salt)
     - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
     - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
@@ -39,7 +39,7 @@ newPRWelcomeComment: >
 
     - [Community Wiki](https://github.com/saltstack/community/wiki)
     - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
-    - [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg)
+    - [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-1zlfxffs1-NuEH~G9TzOeuNGdsfZIl3w)
     - [IRC on LiberaChat](https://web.libera.chat/#salt)
     - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
     - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)

diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml
@@ -35,7 +35,7 @@ jobs:
           - src
 
     container:
-      image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-11
+      image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12
 
     steps:
       # Checkout here so we can easily use custom actions

diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml
@@ -21,12 +21,12 @@ on:
       relenv-version:
         required: false
         type: string
-        default: 0.12.3
+        default: 0.13.2
         description: The version of relenv to use
       python-version:
         required: false
         type: string
-        default: 3.10.9
+        default: 3.10.12
         description: The version of python to use with relenv
 
 env:

diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
@@ -21,12 +21,12 @@ on:
       relenv-version:
         required: false
         type: string
-        default: 0.12.3
+        default: 0.13.2
         description: The version of relenv to use
       python-version:
         required: false
         type: string
-        default: 3.10.9
+        default: 3.10.12
         description: The version of python to use with relenv
 
 env: