Skip to content

Commit 152eb5e

Browse files
Merge branch 'add_cleaverna' of github.com:reyhaneh-tavakoli/galaxytools into add_cleaverna
2 parents d4f0abc + 26d5620 commit 152eb5e

3 files changed

Lines changed: 22 additions & 20 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
types: [run-all-tool-tests-command]
88
env:
99
GALAXY_FORK: galaxyproject
10-
GALAXY_BRANCH: release_25.1
10+
GALAXY_BRANCH: release_26.0
1111
MAX_CHUNKS: 40
1212
jobs:
1313
setup:
@@ -105,7 +105,7 @@ jobs:
105105
repository-list: ${{ needs.setup.outputs.repository-list }}
106106
tool-list: ${{ needs.setup.outputs.tool-list }}
107107
additional-planemo-options: --biocontainers --skip version_bumped
108-
- uses: actions/upload-artifact@v6
108+
- uses: actions/upload-artifact@v7
109109
if: ${{ failure() }}
110110
with:
111111
name: 'Tool linting output'
@@ -145,7 +145,7 @@ jobs:
145145
path: ~/.cache/pip
146146
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
147147
- name: Get number of CPU cores
148-
uses: SimenB/github-actions-cpu-cores@v2
148+
uses: SimenB/github-actions-cpu-cores@v3
149149
id: cpu-cores
150150
- name: Clean dotnet folder for space
151151
run: rm -Rf /usr/share/dotnet
@@ -162,7 +162,7 @@ jobs:
162162
galaxy-slots: ${{ steps.cpu-cores.outputs.count }}
163163
# Limit each test to 15 minutes
164164
test_timeout: 900
165-
- uses: actions/upload-artifact@v6
165+
- uses: actions/upload-artifact@v7
166166
with:
167167
name: 'Tool test output ${{ matrix.chunk }}'
168168
path: upload
@@ -181,7 +181,7 @@ jobs:
181181
# This job runs on Linux
182182
runs-on: ubuntu-latest
183183
steps:
184-
- uses: actions/download-artifact@v7
184+
- uses: actions/download-artifact@v8
185185
with:
186186
path: artifacts
187187
- uses: actions/setup-python@v6
@@ -200,7 +200,7 @@ jobs:
200200
mode: combine
201201
html-report: true
202202
markdown-report: true
203-
- uses: actions/upload-artifact@v6
203+
- uses: actions/upload-artifact@v7
204204
with:
205205
name: 'All tool test results'
206206
path: upload

.github/workflows/pr.yaml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
- '*'
1818
env:
1919
GALAXY_FORK: galaxyproject
20-
GALAXY_BRANCH: release_25.1
20+
GALAXY_BRANCH: release_26.0
2121
MAX_CHUNKS: 4
2222
MAX_FILE_SIZE: 1M
2323
concurrency:
@@ -167,7 +167,7 @@ jobs:
167167
repository-list: ${{ needs.setup.outputs.repository-list }}
168168
tool-list: ${{ needs.setup.outputs.tool-list }}
169169
additional-planemo-options: ${{ env.EXTRA_SKIP }}
170-
- uses: actions/upload-artifact@v6
170+
- uses: actions/upload-artifact@v7
171171
if: ${{ failure() }}
172172
with:
173173
name: 'Tool linting output'
@@ -200,7 +200,7 @@ jobs:
200200
run: pip install flake8 flake8-import-order
201201
- name: Flake8
202202
run: echo '${{ needs.setup.outputs.repository-list }}' | xargs -d '\n' flake8 --output-file pylint_report.txt --tee
203-
- uses: actions/upload-artifact@v6
203+
- uses: actions/upload-artifact@v7
204204
if: ${{ failure() }}
205205
with:
206206
name: 'Python linting output'
@@ -239,7 +239,7 @@ jobs:
239239
echo '${{ needs.setup.outputs.repository-list }}' | xargs -d '\n' -n 1 ./.github/styler.R --dry off
240240
git status
241241
git diff --exit-code | tee rlint_report.txt
242-
- uses: actions/upload-artifact@v6
242+
- uses: actions/upload-artifact@v7
243243
if: ${{ failure() }}
244244
with:
245245
name: 'R linting output'
@@ -267,7 +267,7 @@ jobs:
267267
cat file_size_report.txt
268268
exit 1
269269
fi
270-
- uses: actions/upload-artifact@v6
270+
- uses: actions/upload-artifact@v7
271271
if: ${{ failure() }}
272272
with:
273273
name: 'File size report'
@@ -314,7 +314,7 @@ jobs:
314314
path: ~/.planemo
315315
key: planemo_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
316316
- name: Get number of CPU cores
317-
uses: SimenB/github-actions-cpu-cores@v2
317+
uses: SimenB/github-actions-cpu-cores@v3
318318
id: cpu-cores
319319
- name: Clean dotnet folder for space
320320
run: rm -Rf /usr/share/dotnet
@@ -330,8 +330,8 @@ jobs:
330330
chunk-count: ${{ needs.setup.outputs.chunk-count }}
331331
galaxy-slots: ${{ steps.cpu-cores.outputs.count }}
332332
# Limit each test to 15 minutes
333-
test_timeout: 1800
334-
- uses: actions/upload-artifact@v6
333+
test_timeout: 900
334+
- uses: actions/upload-artifact@v7
335335
with:
336336
name: 'Tool test output ${{ matrix.chunk }}'
337337
path: upload
@@ -350,7 +350,7 @@ jobs:
350350
matrix:
351351
python-version: ['3.11']
352352
steps:
353-
- uses: actions/download-artifact@v7
353+
- uses: actions/download-artifact@v8
354354
with:
355355
path: artifacts
356356
- uses: actions/setup-python@v6
@@ -369,7 +369,7 @@ jobs:
369369
mode: combine
370370
html-report: true
371371
markdown-report: true
372-
- uses: actions/upload-artifact@v6
372+
- uses: actions/upload-artifact@v7
373373
with:
374374
name: 'All tool test results'
375375
path: upload
@@ -393,7 +393,6 @@ jobs:
393393
needs: [setup, lint, combine_outputs]
394394
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' ) && github.repository_owner == 'bgruening' }}
395395
runs-on: ubuntu-latest
396-
environment: toolshed-deployment
397396
strategy:
398397
matrix:
399398
python-version: ['3.11']
@@ -429,9 +428,8 @@ jobs:
429428
deploy-report:
430429
name: Report deploy status
431430
needs: [deploy]
432-
if: ${{ always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' ) }}
431+
if: ${{ always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' ) && github.repository_owner == 'bgruening' }}
433432
runs-on: ubuntu-latest
434-
environment: toolshed-deployment
435433
steps:
436434
# report to the PR if deployment failed
437435
- name: Get PR object

.github/workflows/pr_without_tool_change.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ name: Fallback
44
# see https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
55
on:
66
pull_request:
7+
paths:
8+
- 'deprecated/**'
9+
- 'docs/**'
10+
- '.github/**'
11+
- '*'
712
concurrency:
813
group: ${{ github.workflow }}-${{ github.ref }}
9-
cancel-in-progress: true
1014
jobs:
1115
determine-success:
1216
name: Check workflow success

0 commit comments

Comments
 (0)