Skip to content

Commit 6f33652

Browse files
authored
Merge branch 'master' into fix_msconvert_defaults
2 parents 65df042 + 7f091ab commit 6f33652

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 4 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_24.0
10+
GALAXY_BRANCH: release_24.1
1111
MAX_CHUNKS: 40
1212
jobs:
1313
setup:
@@ -32,7 +32,7 @@ jobs:
3232
token: ${{ secrets.PAT }}
3333
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
3434
comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
35-
reaction-type: hooray
35+
reactions: hooray
3636
- name: Set galaxy fork and branch
3737
id: get-fork-branch
3838
run: |
@@ -75,7 +75,7 @@ jobs:
7575
echo 'Using ${{ steps.discover.outputs.chunk-count }} chunks (${{ steps.discover.outputs.chunk-list }})'
7676
7777
lint:
78-
name: Check for missing containers
78+
name: Lint tool-list
7979
needs: setup
8080
if: ${{ needs.setup.outputs.repository-list != '' || needs.setup.outputs.tool-list != '' }}
8181
runs-on: ubuntu-latest
@@ -101,9 +101,10 @@ jobs:
101101
id: lint
102102
with:
103103
mode: lint
104+
fail-level: warn
104105
repository-list: ${{ needs.setup.outputs.repository-list }}
105106
tool-list: ${{ needs.setup.outputs.tool-list }}
106-
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
107+
additional-planemo-options: --biocontainers
107108
- uses: actions/upload-artifact@v4
108109
if: ${{ failure() }}
109110
with:

.github/workflows/pr.yaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- '*'
1616
env:
1717
GALAXY_FORK: galaxyproject
18-
GALAXY_BRANCH: release_24.0
18+
GALAXY_BRANCH: release_24.1
1919
MAX_CHUNKS: 4
2020
MAX_FILE_SIZE: 1M
2121
concurrency:
@@ -123,21 +123,12 @@ jobs:
123123
with:
124124
path: ~/.cache/pip
125125
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
126-
127-
- name: Set fail level for pull request
128-
if: ${{ github.event_name == 'pull_request' }}
129-
run:
130-
echo "FAIL_LEVEL=warn" >> "$GITHUB_ENV"
131-
- name: Set fail level for merge
132-
if: ${{ github.event_name != 'pull_request' }}
133-
run:
134-
echo "FAIL_LEVEL=error" >> "$GITHUB_ENV"
135126
- name: Planemo lint
136127
uses: galaxyproject/planemo-ci-action@v1
137128
id: lint
138129
with:
139130
mode: lint
140-
fail-level: ${{ env.FAIL_LEVEL }}
131+
fail-level: warn
141132
repository-list: ${{ needs.setup.outputs.repository-list }}
142133
tool-list: ${{ needs.setup.outputs.tool-list }}
143134
- uses: actions/upload-artifact@v4

.github/workflows/slash.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- name: Slash Command Dispatch
1010
if: github.repository_owner == 'galaxyproteomics'
11-
uses: peter-evans/slash-command-dispatch@v3
11+
uses: peter-evans/slash-command-dispatch@v4
1212
with:
1313
token: ${{ secrets.PAT }}
1414
commands: |

0 commit comments

Comments
 (0)