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.

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

Submodules: created branch with required submodules to match gui_map.… #13

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
uses: actions/checkout@v4
with:
# Need this to get version number from last tag
submodules: recursive
fetch-depth: 0

- name: Set up Docker Buildx
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
uses: actions/checkout@v4
with:
# Need this to get version number from last tag
submodules: recursive
fetch-depth: 0

- if: inputs.python-version == 'dev'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/_tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ on:
description: What to run under tox
required: true


jobs:
run:
runs-on: "ubuntu-latest"

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install python packages
uses: ./.github/actions/install_requirements
Expand Down
7 changes: 7 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[submodule "blgui"]
path = blgui
url = [email protected]:controls/support/blgui.git
branch = BLGuiYaml
[submodule "p47-services"]
path = p47-services
url = https://github.com/epics-containers/p47-services.git
1 change: 1 addition & 0 deletions blgui
Submodule blgui added at 4eac64
1 change: 1 addition & 0 deletions p47-services
Submodule p47-services added at f4bf3a
4 changes: 2 additions & 2 deletions src/phoebus_guibuilder/guibuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def find_services_folders():
services_directory = (
beamline.dom + "-services/services"
) # TODO: rm hardcoding, map to services.
path = f"/dls/science/users/uns32131/{services_directory}"
path = f"{services_directory}"
files = os.listdir(path)

# Attempting to match the prefix to the files in the services directory
Expand Down Expand Up @@ -145,7 +145,7 @@ def extract_valid_entities(ioc_yaml: str, component: Component):


def gui_map(entrys: list[Entry]):
gui_map = "/dls/science/users/uns32131/BLGui/BLGuiApp/opi/bob/gui_map.yaml"
gui_map = "blgui/BLGuiApp/opi/bob/gui_map.yaml"

with open(gui_map) as map:
conf = yaml.safe_load(map)
Expand Down
Loading