@@ -2,6 +2,7 @@ name: Build image
22on : [push, pull_request]
33env :
44 MULLED_NAMESPACE : biocontainers
5+ MULLED_TOOL_UTIL_SOURCE : git+https://github.com/bgruening/galaxy.git@mulled_quay_enhancements#subdirectory=packages/tool_util
56jobs :
67 build-and-test :
78 runs-on : ubuntu-latest
@@ -14,16 +15,12 @@ jobs:
1415 - uses : actions/setup-python@v5
1516 with :
1617 python-version : ${{ matrix.python-version }}
17- - name : Install python dependencies
18- run : |
19- #python -m pip install git+https://git@github.com/galaxyproject/galaxy.git@dev#subdirectory=packages/util
20- #python -m pip install git+https://git@github.com/galaxyproject/galaxy.git@dev#subdirectory=packages/tool_util
21- python -m pip install galaxy-tool-util
18+ - uses : astral-sh/setup-uv@v7
2219 - run : docker --version
2320 - run : docker info
2421 - name : Build images
2522 run : |
26- mulled-build-files --check-published --singularity --namespace $MULLED_NAMESPACE build-and-test ./combinations --verbose
23+ uv run --with "$MULLED_TOOL_UTIL_SOURCE" python -m galaxy.tool_util.deps.mulled.mulled_build_files --check-published --singularity --namespace $MULLED_NAMESPACE build-and-test ./combinations --verbose
2724 - name : Upload images (if pushed to master branch)
2825 if : github.ref == 'refs/heads/master' && github.repository_owner == 'BioContainers'
2926 env :
3431 ssh-keyscan -t rsa depot.galaxyproject.org >> ~/.ssh/known_hosts
3532 ssh-agent -a $SSH_AUTH_SOCK > /dev/null
3633 ssh-add - <<< "${{ secrets.ORVAL_KEY }}"
37- mulled-build-files --check-published --namespace $MULLED_NAMESPACE --oauth-token ${{ secrets.QUAY_OAUTH_TOKEN }} push ./combinations
34+ uv run --with "$MULLED_TOOL_UTIL_SOURCE" python -m galaxy.tool_util.deps.mulled.mulled_build_files --check-published --namespace $MULLED_NAMESPACE --oauth-token ${{ secrets.QUAY_OAUTH_TOKEN }} push ./combinations
3835 ls -l singularity_import
3936 [ "$(ls -A singularity_import)" ] && echo 'uploading Singularity images' && scp singularity_import/*:* singularity@depot.galaxyproject.org:/srv/nginx/depot.galaxyproject.org/root/singularity/
0 commit comments