Skip to content

replace references to common repo #228

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

Merged
jackbdoughty merged 2 commits into from
Apr 10, 2025
Merged

replace references to common repo #228

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
79f44cf
replace references to common repo
rerpha Mar 12, 2025
be5b9a2
add comment about username and deploy token
rerpha Mar 12, 2025
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
8 changes: 7 additions & 1 deletion installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ def setup_calibrations_repository(self) -> None:
):
self.update_calibrations_repository()
else:
repo_url = "http://control-svcs.isis.cclrc.ac.uk/gitroot/instconfigs/common.git"
repo_url = "https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git"
location = "C:\Instrument\Settings\config\common"
RunProcess(
working_dir=os.curdir,
Expand All @@ -352,6 +352,12 @@ def update_calibrations_repository(self) -> None:
"""Update the calibration repository"""
try:
repo = git.Repo(CALIBRATION_PATH)
print(
"If this is the first time using the gitlab calibration files repo, "
"you'll be prompted for username and password please enter username "
"(required on git-for-windows!) and deploy token - "
'see Keeper for this ("Calibrations repository deploy token")'
)
repo.git.pull()
except git.GitCommandError:
self.prompt.prompt_and_raise_if_not_yes(
Expand Down
4 changes: 2 additions & 2 deletions workflow_support_scripts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

### Calibration Files' Location:

`http://control-svcs.isis.cclrc.ac.uk/gitroot/instconfigs/common.git`
`https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git`

This repo should be cloned with:

`git clone http://control-svcs.isis.cclrc.ac.uk/gitroot/instconfigs/common.git C:\Instrument\Settings\config\common`
`git clone https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git C:\Instrument\Settings\config\common`

### Converting Files

Expand Down
Loading