diff --git a/.ci/jenkins.sh b/.ci/jenkins.sh index f99880bd..7ffaf6d8 100755 --- a/.ci/jenkins.sh +++ b/.ci/jenkins.sh @@ -637,7 +637,9 @@ function install_tools() { log "Installing tools" for tool_yaml in "${TOOL_YAMLS[@]}"; do log "Installing tools in ${tool_yaml}" - log_exec shed-tools install -v -g "$GALAXY_URL" -a "$API_KEY" -t "$tool_yaml" || { + # FIXME: after https://github.com/galaxyproject/ephemeris/pull/181 is merged you would need to remove + # --skip_install_resolver_dependencies for install_resolver_dependencies in tools.yaml to work + log_exec shed-tools install --skip_install_resolver_dependencies -v -g "$GALAXY_URL" -a "$API_KEY" -t "$tool_yaml" || { log_error "Tool installation failed" show_logs show_paths diff --git a/usegalaxy.org/annotation.yml.lock b/usegalaxy.org/annotation.yml.lock index 42248e86..d23548f4 100644 --- a/usegalaxy.org/annotation.yml.lock +++ b/usegalaxy.org/annotation.yml.lock @@ -1,11 +1,12 @@ install_repository_dependencies: true -install_resolver_dependencies: true +install_resolver_dependencies: false install_tool_dependencies: false tool_panel_section_label: Annotation tools: - name: prokka owner: crs4 revisions: + - 8a22554cdde2 - bf68eb663bc3 - eaee459f3d69 - 111884f0d912