From 1ec37df96df2c188e1f254542e680d2e12a0f83e Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Fri, 10 Feb 2023 11:09:06 +0100 Subject: [PATCH] Revert "try to parametrize the planemo-ci-action" This reverts commit 56ab325848f7e5e8c1057a2088bdf94c73209612. impossible, because we can not use `uses: ${{ planemo-ci-action }}` lets see if `uses: ./` just does the intended --- .github/workflows/wf_deploy.yaml | 7 +------ .github/workflows/wf_lint.yaml | 5 ----- .github/workflows/wf_setup.yaml | 11 +++-------- .github/workflows/wf_test.yaml | 9 ++------- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/.github/workflows/wf_deploy.yaml b/.github/workflows/wf_deploy.yaml index 07f68c0..c4bb006 100644 --- a/.github/workflows/wf_deploy.yaml +++ b/.github/workflows/wf_deploy.yaml @@ -20,11 +20,6 @@ on: default: "planemo" required: false type: string - planemo-ci-action: - description: 'Version of the planemo ci action to use' - default: 'galaxyproject/planemo-ci-action@v1' - required: false - type: string secrets: TTS_API_KEY: required: true @@ -54,7 +49,7 @@ jobs: path: ~/.cache/pip 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: ${{ planemo-ci-action }} + uses: galaxyproject/planemo-ci-action@v1 with: mode: deploy repository-list: ${{ inputs.repository-list }} diff --git a/.github/workflows/wf_lint.yaml b/.github/workflows/wf_lint.yaml index f09e9ef..574ba16 100644 --- a/.github/workflows/wf_lint.yaml +++ b/.github/workflows/wf_lint.yaml @@ -56,11 +56,6 @@ on: default: "planemo" required: false type: string - planemo-ci-action: - description: 'Version of the planemo ci action to use' - default: 'galaxyproject/planemo-ci-action@v1' - required: false - type: string outputs: result: description: "Result of the lint jobs" diff --git a/.github/workflows/wf_setup.yaml b/.github/workflows/wf_setup.yaml index 459ce3b..0e6b520 100644 --- a/.github/workflows/wf_setup.yaml +++ b/.github/workflows/wf_setup.yaml @@ -1,4 +1,4 @@ -name: Setup +name: Test tools on: workflow_call: inputs: @@ -24,18 +24,13 @@ on: fetch-depth: description: 'Number of commits to fetch. 0 indicates all history for all branches and tags' default: 1 - required: false + required: false type: number python-version-list: description: 'Python versions (stringified JSON array)' default: "[\"3.7\"]" required: false type: string - planemo-ci-action: - description: 'Version of the planemo ci action to use' - default: 'galaxyproject/planemo-ci-action@v1' - required: false - type: string secrets: PAT: required: false @@ -153,7 +148,7 @@ jobs: with: fetch-depth: ${{ inputs.fetch-depth }} - name: Fake a Planemo run to update cache and determine commit range, repositories, and chunks - uses: ${{ planemo-ci-action }} + uses: galaxyproject/planemo-ci-action@v1 id: discover with: create-cache: ${{ steps.cache-pip.outputs.cache-hit != 'true' || steps.cache-planemo.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/wf_test.yaml b/.github/workflows/wf_test.yaml index cdca6e1..eb7d280 100644 --- a/.github/workflows/wf_test.yaml +++ b/.github/workflows/wf_test.yaml @@ -46,11 +46,6 @@ on: default: "planemo" required: false type: string - planemo-ci-action: - description: 'Version of the planemo ci action to use' - default: 'galaxyproject/planemo-ci-action@v1' - required: false - type: string secrets: PAT: required: false @@ -106,7 +101,7 @@ jobs: - name: Clean dotnet folder for space run: rm -Rf /usr/share/dotnet - name: Planemo test - uses: ${{ planemo-ci-action }} + uses: galaxyproject/planemo-ci-action@v1 id: test with: mode: test @@ -150,7 +145,7 @@ jobs: path: ~/.cache/pip key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ inputs.galaxy-head-sha }}_planemo_${{ steps.get-galaxy-sha.outputs.planemo-version }} - name: Combine outputs - uses: ${{ planemo-ci-action }} + uses: galaxyproject/planemo-ci-action@v1 id: combine with: mode: combine