Revert "try to parametrize the planemo-ci-action"

This reverts commit 56ab325. impossible, because we can not use `uses: ${{ planemo-ci-action }}` lets see if `uses: ./` just does the intended
galaxyproject · Feb 10, 2023 · 1ec37df · 1ec37df
1 parent cefaadb
commit 1ec37df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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