From 1eafcceae239e1ff2aebfa304614d2bb812104e7 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Sun, 27 Nov 2022 18:04:57 +0100 Subject: [PATCH] finish planemo-version --- .github/workflows/ci.yaml | 1 + .github/workflows/pr.yaml | 1 + .github/workflows/wf_deploy.yaml | 11 +++++++++-- .github/workflows/wf_lint.yaml | 10 ++++++++-- .github/workflows/wf_setup.yaml | 4 ++-- .github/workflows/wf_test.yaml | 13 ++++++++++--- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8eb35a1de75..f0dc018bd22 100644 --- 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 index 0dec21775ea..a7c6230d1ea 100644 --- 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 index 7fd9ea18ee8..eeccce29c64 100644 --- 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,7 +47,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: Deploy on testtoolshed uses: galaxyproject/planemo-ci-action@v1 with: @@ -50,6 +55,7 @@ jobs: 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 @@ -57,4 +63,5 @@ jobs: mode: deploy repository-list: ${{ inputs.repository-list }} shed-target: toolshed - shed-key: ${{ secrets.TS_API_KEY }} \ No newline at end of file + shed-key: ${{ secrets.TS_API_KEY }} + planemo-version: ${{ inputs.planemo-version }} \ No newline at end of file diff --git a/.github/workflows/wf_lint.yaml b/.github/workflows/wf_lint.yaml index 21b4d3694b1..f95e16fa182 100644 --- 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 index b91fcbcd7cf..ce40264b1b7 100644 --- 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 index 9195b820a2b..cf68bbc460c 100644 --- 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: