Combine build bare with build salt deps

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

.github/actions/build-onedir-bare/action.yml

@@ -1,54 +0,0 @@
----
-name: build-onedir-bare
-description: Build Bare Onedir Package
-inputs:
-  platform:
-    required: true
-    type: string
-    description: The platform to build
-  arch:
-    required: true
-    type: string
-    description: The platform arch to build
-  package-name:
-    required: false
-    type: string
-    description: The onedir package name to create
-    default: salt
-
-runs:
-  using: composite
-
-  steps:
-
-    - name: Cache Bare Onedir Package Directory
-      id: onedir-pkg-cache
-      uses: actions/cache@v3
-      with:
-        path: artifacts/${{ inputs.package-name }}
-        key: ${{ env.CACHE_SEED }}|relenv|${{ env.RELENV_VERSION }}|bare|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles('.relenv/**/*.xz') }}
-
-    - name: Create Onedir Directory
-      shell: bash
-      if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
-      run: |
-        python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-        python3 -m relenv create --arch=${{ inputs.arch }} artifacts/${{ inputs.package-name }}
-
-    - name: Upgrade Setuptools & Pip
-      shell: bash
-      if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
-      run: |
-        if [ "${{ inputs.platform }}" != "windows" ]; then
-          artifacts/${{ inputs.package-name }}/bin/python3 -m pip install -U "pip>=22.3.1,<23.0"
-          artifacts/${{ inputs.package-name }}/bin/python3 -m pip install -U "setuptools>=65.6.3,<66"
-        else
-          artifacts/${{ inputs.package-name }}/Scripts/python -m pip install -U "pip>=22.3.1,<23.0"
-          artifacts/${{ inputs.package-name }}/Scripts/python -m pip install -U "setuptools>=65.6.3,<66"
-        fi
-
-    - name: Cleanup Onedir Directory
-      shell: bash
-      if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
-      run: |
-        tools pkg pre-archive-cleanup artifacts/${{ inputs.package-name }}

.github/actions/build-onedir-deps/action.yml

@@ -21,19 +21,31 @@ runs:
 
   steps:
 
-    - name: Download Cached Bare Onedir Package Directory
-      id: onedir-bare-cache
-      uses: actions/cache@v3
-      with:
-        path: artifacts/${{ inputs.package-name }}
-        key: ${{ env.CACHE_SEED }}|relenv|${{ env.RELENV_VERSION }}|bare|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles('.relenv/**/*.xz') }}
-
     - name: Cache Deps Onedir Package Directory
       id: onedir-pkg-cache
       uses: actions/cache@v3
       with:
         path: artifacts/${{ inputs.package-name }}
-        key: ${{ env.CACHE_SEED }}|relenv|${{ env.RELENV_VERSION }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles('.relenv/**/*.xz', 'requirements/static/pkg/*/*.txt') }}
+        key: ${{ env.CACHE_SEED }}|relenv|${{ env.RELENV_VERSION }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles(format('{0}/.relenv/**/*.xz', github.workspace), 'requirements/static/pkg/*/*.txt') }}
+
+    - name: Create Onedir Directory
+      shell: bash
+      if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
+      run: |
+        python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
+        python3 -m relenv create --arch=${{ inputs.arch }} artifacts/${{ inputs.package-name }}
+
+    - name: Upgrade Setuptools & Pip
+      shell: bash
+      if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
+      run: |
+        if [ "${{ inputs.platform }}" != "windows" ]; then
+          artifacts/${{ inputs.package-name }}/bin/python3 -m pip install -U "pip>=22.3.1,<23.0"
+          artifacts/${{ inputs.package-name }}/bin/python3 -m pip install -U "setuptools>=65.6.3,<66"
+        else
+          artifacts/${{ inputs.package-name }}/Scripts/python -m pip install -U "pip>=22.3.1,<23.0"
+          artifacts/${{ inputs.package-name }}/Scripts/python -m pip install -U "setuptools>=65.6.3,<66"
+        fi
 
     - name: Install Salt Onedir Package Dependencies
       env:
@@ -41,7 +53,6 @@ runs:
         PIP_EXTRA_INDEX_URL: https://pypi.org/simple
       shell: bash
       run: |
-        python3 -c "import os; os.makedirs('.downloaded-dependencies', exist_ok=True)"
         if [ "${{ inputs.platform }}" != "windows" ]; then
           artifacts/${{ inputs.package-name }}/bin/python3 -m pip install -r requirements/static/pkg/py3.10/${{ inputs.platform }}.txt
         else

.github/actions/build-onedir-pkg/action.yml

@@ -26,7 +26,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: artifacts/${{ inputs.package-name }}
-        key: ${{ env.CACHE_SEED }}|relenv|${{ env.RELENV_VERSION }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles('.relenv/**/*.xz', 'requirements/static/pkg/*/*.txt') }}
+        key: ${{ env.CACHE_SEED }}|relenv|${{ env.RELENV_VERSION }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles(format('{0}/.relenv/**/*.xz', github.workspace), 'requirements/static/pkg/*/*.txt') }}
 
     - name: Install Salt Into Onedir
       env:

.github/workflows/ci.yml

@@ -242,54 +242,11 @@ jobs:
     with:
       changed-files: ${{ needs.prepare-ci.outputs.changed-files }}
 
-  build-bare-linux:
-    name: Build Bare Onedir Linux
-    if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
-    needs:
-      - prepare-ci
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-          - x86_64
-          - aarch64
-    runs-on:
-      - self-hosted
-      - linux
-      - ${{ matrix.arch }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Relenv
-        uses: ./.github/actions/setup-relenv
-        with:
-          platform: linux
-          arch: ${{ matrix.arch }}
-      - name: Setup Bare Relenv Onedir
-        uses: ./.github/actions/build-onedir-bare
-        with:
-          platform: linux
-          arch: ${{ matrix.arch }}
-
-      - name: Set Exit Status
-        if: always()
-        run: |
-          python3 -c "import os; os.makedirs('exitstatus', exist_ok=True)"
-          echo "${{ job.status }}" > exitstatus/${{ github.job }}-linux-${{ matrix.arch }}
-
-      - name: Upload Exit Status
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: exitstatus
-          path: exitstatus
-          if-no-files-found: error
-
   build-deps-linux:
     name: Build Salt Onedir Dependencies Linux
     if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
     needs:
       - prepare-ci
-      - build-bare-linux
     strategy:
       fail-fast: false
       matrix:
@@ -384,58 +341,11 @@ jobs:
           path: exitstatus
           if-no-files-found: error
 
-  build-bare-windows:
-    name: Build Bare Onedir Windows
-    if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['github-hosted-runners'] }}
-    needs:
-      - prepare-ci
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-          - amd64
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-      - name: Setup Relenv
-        uses: ./.github/actions/setup-relenv
-        with:
-          platform: windows
-          arch: ${{ matrix.arch }}
-
-      - name: Setup Python Tools Scripts
-        uses: ./.github/actions/setup-python-tools-scripts
-
-      - name: Setup Bare Relenv Onedir
-        uses: ./.github/actions/build-onedir-bare
-        with:
-          platform: windows
-          arch: ${{ matrix.arch }}
-
-      - name: Set Exit Status
-        if: always()
-        run: |
-          python3 -c "import os; os.makedirs('exitstatus', exist_ok=True)"
-          echo "${{ job.status }}" > exitstatus/${{ github.job }}-windows-${{ matrix.arch }}
-
-      - name: Upload Exit Status
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: exitstatus
-          path: exitstatus
-          if-no-files-found: error
-
   build-deps-windows:
     name: Build Salt Dependencies Onedir Windows
     if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['github-hosted-runners'] }}
     needs:
       - prepare-ci
-      - build-bare-windows
     strategy:
       fail-fast: false
       matrix:
@@ -533,60 +443,11 @@ jobs:
           path: exitstatus
           if-no-files-found: error
 
-  build-bare-macos:
-    name: Build Bare Onedir macOS
-    if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['github-hosted-runners'] }}
-    needs:
-      - prepare-ci
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-          - x86_64
-    runs-on: macos-12
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      - name: Setup Python Tools Scripts
-        uses: ./.github/actions/setup-python-tools-scripts
-
-      - name: Setup Relenv
-        uses: ./.github/actions/setup-relenv
-        with:
-          platform: darwin
-          arch: ${{ matrix.arch }}
-
-      - name: Setup Bare Relenv Onedir
-        uses: ./.github/actions/build-onedir-bare
-        with:
-          platform: darwin
-          arch: ${{ matrix.arch }}
-
-      - name: Set Exit Status
-        if: always()
-        run: |
-          python3 -c "import os; os.makedirs('exitstatus', exist_ok=True)"
-          echo "${{ job.status }}" > exitstatus/${{ github.job }}-macos-${{ matrix.arch }}
-
-      - name: Upload Exit Status
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: exitstatus
-          path: exitstatus
-          if-no-files-found: error
-
   build-deps-macos:
     name: Build Salt Dependencies Onedir macOS
     if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['github-hosted-runners'] }}
     needs:
       - prepare-ci
-      - build-bare-macos
     strategy:
       fail-fast: false
       matrix: