Merge pull request #39 from lorengordon/patch/salt-python-requirements

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.4.1
+current_version = 1.5.0
 commit = True
 message = Bumps version to {new_version}
 tag = False

.github/workflows/test-salt-linux.yml

@@ -23,6 +23,10 @@ on:
         description: Space-separated list of paths to requirements files installed by yum, `salt-os-version` is templated as `{0}`
         default: ./tests/requirements.txt ./tests/requirements-el{0}.txt
         type: string
+      salt-python-requirements-files:
+        description: Space-separated list of paths to python requirements files installed by salt-pip, `salt-os-version` is templated as `{0}`
+        default: ''
+        type: string
 
 defaults:
   run:
@@ -56,6 +60,14 @@ jobs:
 
       - run: salt-call --versions-report
 
+      # Install salt python requirements
+      - if: inputs.salt-python-requirements-files
+        run: >
+          mapfile -t PYTHON_REQUIREMENTS < <(echo ${{ format(inputs.salt-python-requirements-files, inputs.salt-os-version) }}) &&
+          for FILE in "${PYTHON_REQUIREMENTS[@]}"; do
+          salt-pip install -r "$FILE";
+          done
+
       - run: >-
           salt-call --local --retcode-passthrough
           --file-root=${{ github.workspace }} --pillar-root=${{ inputs.salt-pillar-root }}

.github/workflows/test-salt-windows.yml

@@ -27,6 +27,10 @@ on:
         description: Base url to search for the salt version; `salt-version` is appended to this url
         default: https://repo.saltproject.io/salt/py3/windows
         type: string
+      salt-python-requirements-files:
+        description: Space-separated list of paths to python requirements files installed by salt-pip, `salt-os-version` is templated as `{0}`
+        default: ''
+        type: string
 
 defaults:
   run:
@@ -57,6 +61,14 @@ jobs:
         shell: pwsh
       - run: C:\\salt\\salt-call.exe --versions-report
 
+      # Install salt python requirements
+      - if: inputs.salt-python-requirements-files
+        run: >
+          mapfile -t PYTHON_REQUIREMENTS < <(echo ${{ format(inputs.salt-python-requirements-files, inputs.salt-os-version) }}) &&
+          for FILE in "${PYTHON_REQUIREMENTS[@]}"; do
+          C:\\salt\\salt-pip.exe install -r "$FILE";
+          done
+
       # Sync custom salt modules, if any
       - run: >
           C:\\salt\\salt-call.exe --local --retcode-passthrough

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### [1.5.0](https://github.com/plus3it/actions-workflows/releases/tag/1.5.0)
+
+**Released**: 2024.02.22
+
+**Summary**:
+
+*   Updates salt workflows with option to install python requirements into salt
+    runtime
+
 ### [1.4.1](https://github.com/plus3it/actions-workflows/releases/tag/1.4.1)
 
 **Released**: 2024.02.21