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

Pmac module version update, add motorPIGCS2 and MCA IOC #64

Merged
merged 5 commits into from
Aug 19, 2024
Merged

Conversation

guirodrigueslima
Copy link
Contributor

No description provided.

@guirodrigueslima guirodrigueslima force-pushed the dev branch 6 times, most recently from 91c882f to 43d40ec Compare May 20, 2024 14:55
Copy link
Member

@ericonr ericonr left a comment

Choose a reason for hiding this comment

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

How soon do you need these?

It would be nice to have module pruning added before we merge so many new images.

base/.env Outdated Show resolved Hide resolved
CHANGES.md Outdated Show resolved Hide resolved
CHANGES.md Outdated Show resolved Hide resolved
images/docker-compose-motorpigcs2.yml Show resolved Hide resolved
images/docker-compose-motorpigcs2.yml Outdated Show resolved Hide resolved
base/.env Show resolved Hide resolved
base/docker-compose.yml Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install_modules.sh Outdated Show resolved Hide resolved
images/docker-compose-mca.yml Show resolved Hide resolved
@guirodrigueslima guirodrigueslima force-pushed the dev branch 4 times, most recently from b03ef7a to cfad10d Compare May 20, 2024 18:47
base/docker-compose.yml Outdated Show resolved Hide resolved
base/musl/Dockerfile Outdated Show resolved Hide resolved
base/musl/docker-compose.yml Outdated Show resolved Hide resolved
CHANGES.md Outdated Show resolved Hide resolved
base/.env Outdated Show resolved Hide resolved
@guirodrigueslima guirodrigueslima force-pushed the dev branch 3 times, most recently from 567231f to 8edf8da Compare May 21, 2024 17:01
.github/workflows/included-images.yml Outdated Show resolved Hide resolved
base/install_modules.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/musl/docker-compose.yml Outdated Show resolved Hide resolved
Copy link
Collaborator

@henriquesimoes henriquesimoes left a comment

Choose a reason for hiding this comment

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

Sorry for the long delay. Having a second look after some time, I've found some minor details yet to be fixed.

CHANGES.md Outdated Show resolved Hide resolved
base/.env Outdated Show resolved Hide resolved
base/docker-compose.yml Outdated Show resolved Hide resolved
base/docker-compose.yml Outdated Show resolved Hide resolved
Copy link
Collaborator

@henriquesimoes henriquesimoes left a comment

Choose a reason for hiding this comment

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

This looks good for me now.

CHANGES.md Outdated Show resolved Hide resolved
base/install_motor.sh Outdated Show resolved Hide resolved
images/docker-compose-motorpigcs2.yml Outdated Show resolved Hide resolved
@guirodrigueslima guirodrigueslima force-pushed the dev branch 2 times, most recently from 1217ea4 to ee49ed3 Compare August 13, 2024 18:37
A pre-release version is used because important bug fixes have not yet
been released, including segmentation fault when the coordinate system
axis object does not exist, and assignment of null offset values upon
Delta Tau reconnection.
@henriquesimoes
Copy link
Collaborator

I've complemented the commit messages, and reworded somethings to be consistent with our previous commits.

I've also recreated the scaler module commit, which was squashed by mistake during the latest rebase.

@henriquesimoes henriquesimoes mentioned this pull request Aug 14, 2024
@gustavosr8
Copy link
Contributor

gustavosr8 commented Aug 14, 2024

Typo in 913c778 commit message

Some IOCs need their own path location variable in the RELEASE file
during build. To avoid custom installation procedures for them, add
"dependency_name" to the EPICS_RELEASE_FILE before ovewriting overwriting the module
RELEASE file during install_module.

@gustavosr8
Copy link
Contributor

I don't think I get the message in 4834166, but I think it may be re-written like this:

Build motorPIGCS2 module from epics-modules/motor. Using a specific
commit is necessary use the latest changes not yet released because
the latest changes have not been yet released, but that have been running
in deploy at Carnauba for almost an year.

Build motorPIGCS2 module from epics-modules/motor. Using a specific
commit is necessary because the latest changes have not been yet
released. However, these changes have been successfully running in
deploy at Carnauba for almost a year.

Since we use the community module without extra libraries linked to the
IOC, build the IOC as an epics-in-docker image.
Some IOCs need their own path location variable in the RELEASE file
during build. To avoid custom installation procedures for them, add
"dependency_name" to the EPICS_RELEASE_FILE before overwriting the
module RELEASE file during `install_module`.
Even though our primary usage will initially be for Amptek devices,
everything in the module is build as defined by the community.

Both libpcap and libnet are required to build MCA support for Canberra
Ethernet acquisition devices. Therefore, the IOC image also installs
these runtime dependencies.
@henriquesimoes henriquesimoes merged commit 11035cd into main Aug 19, 2024
2 checks passed
@henriquesimoes henriquesimoes deleted the dev branch August 19, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants