finish planemo-version

galaxyproject · Nov 27, 2022 · 1eafcce · 1eafcce
1 parent 81e2b8b
commit 1eafcce
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -31,5 +31,6 @@ jobs:
       chunk-list: ${{ needs.setup.outputs.chunk-list }}
       galaxy-head-sha: ${{ needs.setup.outputs.galaxy-head-sha }}
       # test-timeout: 900
+      planemo-version: ${{ needs.setup.outputs.planemo-version }}
     secrets:
       PAT: ${{ secrets.PAT }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -69,6 +69,7 @@ jobs:
     with:
       repository-list: ${{ needs.setup.outputs.repository-list }}
       galaxy-head-sha: ${{ needs.setup.outputs.galaxy-head-sha }}
+      planemo-version: ${{ inputs.planemo-version }}
     secrets:
       TTS_API_KEY: ${{ secrets.TTS_API_KEY }}
       TS_API_KEY: ${{ secrets.TS_API_KEY }}

diff --git a/.github/workflows/wf_deploy.yaml b/.github/workflows/wf_deploy.yaml
@@ -15,6 +15,11 @@ on:
         default: "[\"3.7\"]"
         required: false
         type: string
+      planemo-version:
+        description: 'Planemo version to use'
+        default: "planemo"
+        required: false
+        type: string
     secrets:
       TTS_API_KEY:
         required: true
@@ -42,19 +47,21 @@ jobs:
       id: cache-pip
       with:
         path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}
+        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Deploy on testtoolshed
       uses: galaxyproject/planemo-ci-action@v1
       with:
         mode: deploy
         repository-list: ${{ inputs.repository-list }}
         shed-target: testtoolshed
         shed-key: ${{ secrets.TTS_API_KEY }}
+        planemo-version: ${{ inputs.planemo-version }}
       continue-on-error: true
     - name: Deploy on toolshed
       uses: galaxyproject/planemo-ci-action@v1
       with:
         mode: deploy
         repository-list: ${{ inputs.repository-list }}
         shed-target: toolshed
-        shed-key: ${{ secrets.TS_API_KEY }}
+        shed-key: ${{ secrets.TS_API_KEY }}
+        planemo-version: ${{ inputs.planemo-version }}
diff --git a/.github/workflows/wf_lint.yaml b/.github/workflows/wf_lint.yaml
@@ -51,6 +51,11 @@ on:
         default: "[\"ubuntu-20.04\"]"
         required: false
         type: string
+      planemo-version:
+        description: 'Planemo version to use'
+        default: "planemo"
+        required: false
+        type: string
     outputs:
       result:
         description: "Result of the lint jobs"
@@ -77,7 +82,7 @@ jobs:
       id: cache-pip
       with:
         path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}
+        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Planemo lint
       uses: galaxyproject/planemo-ci-action@v1
       id: lint
@@ -87,6 +92,7 @@ jobs:
         fail-level: ${{ inputs.fail-level }}
         repository-list: ${{ inputs.repository-list }}
         tool-list: ${{ inputs.tool-list }}
+        planemo-version: ${{ inputs.planemo-version }}
     - uses: actions/upload-artifact@v3
       if: ${{ failure() }}
       with:
@@ -113,7 +119,7 @@ jobs:
       id: cache-pip
       with:
         path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}
+        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Install flake8
       run: pip install flake8 flake8-import-order
     - name: Flake8

diff --git a/.github/workflows/wf_setup.yaml b/.github/workflows/wf_setup.yaml
@@ -130,13 +130,13 @@ jobs:
       id: cache-pip
       with:
         path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ steps.get-galaxy-sha.outputs.galaxy-head-sha }}
+        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ steps.get-galaxy-sha.outputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Cache .planemo
       uses: actions/cache@v3
       id: cache-planemo
       with:
         path: ~/.planemo
-        key: planemo_cache_py_${{ matrix.python-version }}_gxy_${{ steps.get-galaxy-sha.outputs.galaxy-head-sha }}
+        key: planemo_cache_py_${{ matrix.python-version }}_gxy_${{ steps.get-galaxy-sha.outputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     # Install the `wheel` package so that when installing other packages which
     # are not available as wheels, pip will build a wheel for them, which can be cached.
     - name: Install wheel

diff --git a/.github/workflows/wf_test.yaml b/.github/workflows/wf_test.yaml
@@ -41,6 +41,11 @@ on:
         default: 900
         required: false
         type: number
+      planemo-version:
+        description: 'Planemo version to use'
+        default: "planemo"
+        required: false
+        type: string
     secrets:
       PAT:
         required: false
@@ -82,14 +87,14 @@ jobs:
       id: cache-pip
       with:
         path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}
+        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Cache .planemo
       if: ${{ inputs.cache-planemo }}
       uses: actions/cache@v3
       id: cache-planemo
       with:
         path: ~/.planemo
-        key: planemo_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}
+        key: planemo_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Get number of CPU cores
       uses: SimenB/github-actions-cpu-cores@v1
       id: cpu-cores
@@ -108,6 +113,7 @@ jobs:
         galaxy-slots: ${{ steps.cpu-cores.outputs.count }}
         # Limit each test to 15 minutes
         test_timeout: ${{ inputs.test-timeout }}
+        planemo-version: ${{ inputs.planemo-version }}
     - uses: actions/upload-artifact@v3
       with:
         name: 'Tool test output ${{ matrix.chunk }}'
@@ -137,12 +143,13 @@ jobs:
       id: cache-pip
       with:
         path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}
+        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }}
     - name: Combine outputs
       uses: galaxyproject/planemo-ci-action@v1
       id: combine
       with:
         mode: combine
+        planemo-version: ${{ inputs.planemo-version }}
         html-report: true
     - uses: actions/upload-artifact@v3
       with: