Skip to content

Commit 0738018

Browse files
committed
Merge branch 'update-galaxy-packages' into test-updating-packages
2 parents 2e4f75b + 4996edc commit 0738018

1 file changed

Lines changed: 20 additions & 1 deletion

File tree

.github/workflows/pr.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ jobs:
7676
# are not available as wheels, pip will build a wheel for them, which can be cached.
7777
- name: Install wheel
7878
run: pip install wheel
79+
- name: Update galaxy packages to match tested Galaxy version
80+
run: |
81+
base="git+https://github.com/${{ env.GALAXY_FORK }}/galaxy.git@${{ env.GALAXY_BRANCH }}#subdirectory=packages"
82+
pip install --reinstall "$base/util" "$base/tool_util_models" "$base/tool_util"
7983
- name: Install flake8
8084
run: pip install flake8 flake8-import-order
8185
- uses: actions/checkout@v5
@@ -124,7 +128,10 @@ jobs:
124128
with:
125129
path: ~/.cache/pip
126130
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
127-
131+
- name: Update galaxy packages to match tested Galaxy version
132+
run: |
133+
base="git+https://github.com/${{ env.GALAXY_FORK }}/galaxy.git@${{ env.GALAXY_BRANCH }}#subdirectory=packages"
134+
pip install --reinstall "$base/util" "$base/tool_util_models" "$base/tool_util"
128135
- name: Set skip version check for push event (i.e. merge to main)
129136
if: ${{ github.event_name != 'pull_request' }}
130137
run:
@@ -282,6 +289,10 @@ jobs:
282289
with:
283290
path: ~/.cache/pip
284291
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
292+
- name: Update galaxy packages to match tested Galaxy version
293+
run: |
294+
base="git+https://github.com/${{ env.GALAXY_FORK }}/galaxy.git@${{ env.GALAXY_BRANCH }}#subdirectory=packages"
295+
pip install --reinstall "$base/util" "$base/tool_util_models" "$base/tool_util"
285296
- name: Cache .planemo
286297
uses: actions/cache@v4
287298
id: cache-planemo
@@ -337,6 +348,10 @@ jobs:
337348
with:
338349
path: ~/.cache/pip
339350
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
351+
- name: Update galaxy packages to match tested Galaxy version
352+
run: |
353+
base="git+https://github.com/${{ env.GALAXY_FORK }}/galaxy.git@${{ env.GALAXY_BRANCH }}#subdirectory=packages"
354+
pip install --reinstall "$base/util" "$base/tool_util_models" "$base/tool_util"
340355
- name: Combine outputs
341356
uses: galaxyproject/planemo-ci-action@v1
342357
id: combine
@@ -384,6 +399,10 @@ jobs:
384399
with:
385400
path: ~/.cache/pip
386401
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ needs.setup.outputs.galaxy-head-sha }}
402+
- name: Update galaxy packages to match tested Galaxy version
403+
run: |
404+
base="git+https://github.com/${{ env.GALAXY_FORK }}/galaxy.git@${{ env.GALAXY_BRANCH }}#subdirectory=packages"
405+
pip install --reinstall "$base/util" "$base/tool_util_models" "$base/tool_util"
387406
- name: Deploy on testtoolshed
388407
uses: galaxyproject/planemo-ci-action@v1
389408
with:

0 commit comments

Comments
 (0)