Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure tpv shared db is loaded first #389

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Make sure tpv shared db is loaded first #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9beeb79
Make sure tpv shared db is loaded first
nuwang Jun 9, 2024
975d451
Pin to commit of tpv-shared-database main branch
mvdbeek Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion env/common/templates/galaxy/config/job_conf.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ execution:
function: map_tool_to_destination
rules_module: tpv.rules
tpv_config_files:
- "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/e2277c4e9aa8044342832f08d9fc06ebf7e8287c/tools.yml"
- "{{ tpv_config_dir }}/defaults.yaml"
- "{{ tpv_config_dir }}/environments.yaml"
- "{{ tpv_config_dir }}/tools_pre_shared.yaml"
- "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/main/tools.yml"
- "{{ tpv_config_dir }}/tools.yaml"
- "{{ tpv_config_dir }}/users.yaml"
- "{{ tpv_config_dir }}/roles.yaml"
Expand Down
2 changes: 1 addition & 1 deletion env/main/templates/galaxy/config/job_conf_vgp.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ execution:
function: map_tool_to_destination
rules_module: tpv.rules
tpv_config_files:
- "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/e2277c4e9aa8044342832f08d9fc06ebf7e8287c/tools.yml"
- "{{ tpv_config_dir }}/defaults_vgp.yaml"
- "{{ tpv_config_dir }}/environments_vgp.yaml"
- "https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/main/tools.yml"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you cut regular releases we can create PRs for updates and test them out. That way we're getting timely updates without the surprise factor.

- "{{ tpv_config_dir }}/tools_vgp.yaml"
#- "{{ tpv_config_dir }}/users_vgp.yaml"
- "{{ tpv_config_dir }}/roles_vgp.yaml"
Expand Down