Merge branch 'main' into create-pull-request/patch-tools

qiime2 · Oct 30, 2024 · 76808f7 · 76808f7
2 parents 873d574 + beba039
commit 76808f7
Show file tree

Hide file tree

Showing 3 changed files with 180 additions and 180 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ on:
 env:
   GALAXY_FORK: galaxyproject
   GALAXY_BRANCH: release_24.1
-  MAX_CHUNKS: 40
+  MAX_CHUNKS: 10  # MODIFIED
 jobs:
   setup:
     name: Setup cache and determine changed repositories
@@ -82,41 +82,43 @@ jobs:
       run: |
         echo 'Using ${{ steps.discover.outputs.chunk-count }} chunks (${{ steps.discover.outputs.chunk-list }})'
 
-  lint:
-    name: Check for missing containers
-    needs: setup
-    if: ${{ needs.setup.outputs.repository-list != '' || needs.setup.outputs.tool-list != '' }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.11']
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Cache .cache/pip
-      uses: actions/cache@v4
-      id: cache-pip
-      with:
-        path: ~/.cache/pip
-        key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
-    - name: Planemo lint
-      uses: galaxyproject/planemo-ci-action@v1
-      id: lint
-      with:
-        mode: lint
-        repository-list: ${{ needs.setup.outputs.repository-list }}
-        tool-list: ${{ needs.setup.outputs.tool-list }}
-        additional-planemo-options: --biocontainers -s stdio,tests,output,inputs,help,general,command,citations,tool_xsd,xml_order,tool_urls,shed_metadata,urls,readme,shed_yaml,repository_dependencies,tool_dependencies_actions,tool_dependencies_sha256sum,tool_dependencies_xsd,expansion
-    - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
-      with:
-        name: 'Tool linting output'
-        path: lint_report.txt
+# MODIFIED START
+  # lint:
+  #   name: Check for missing containers
+  #   needs: setup
+  #   if: ${{ needs.setup.outputs.repository-list != '' || needs.setup.outputs.tool-list != '' }}
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       python-version: ['3.11']
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       fetch-depth: 1
+  #   - uses: actions/setup-python@v5
+  #     with:
+  #       python-version: ${{ matrix.python-version }}
+  #   - name: Cache .cache/pip
+  #     uses: actions/cache@v4
+  #     id: cache-pip
+  #     with:
+  #       path: ~/.cache/pip
+  #       key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
+  #   - name: Planemo lint
+  #     uses: galaxyproject/planemo-ci-action@v1
+  #     id: lint
+  #     with:
+  #       mode: lint
+  #       repository-list: ${{ needs.setup.outputs.repository-list }}
+  #       tool-list: ${{ needs.setup.outputs.tool-list }}
+  #       additional-planemo-options: --biocontainers -s stdio,tests,output,inputs,help,general,command,citations,tool_xsd,xml_order,tool_urls,shed_metadata,urls,readme,shed_yaml,repository_dependencies,tool_dependencies_actions,tool_dependencies_sha256sum,tool_dependencies_xsd,expansion
+  #   - uses: actions/upload-artifact@v4
+  #     if: ${{ failure() }}
+  #     with:
+  #       name: 'Tool linting output'
+  #       path: lint_report.txt
+# MODIFIED END
 
   test:
     name: Test tools