Skip to content

Truncate descriptions of iocEnvVars to 40 characters if needed#77

Merged
simon-ess merged 3 commits into
epics-modules:masterfrom
jwlodek:truncate-epics-base-config-pvs
Mar 31, 2026
Merged

Truncate descriptions of iocEnvVars to 40 characters if needed#77
simon-ess merged 3 commits into
epics-modules:masterfrom
jwlodek:truncate-epics-base-config-pvs

Conversation

@jwlodek
Copy link
Copy Markdown
Contributor

@jwlodek jwlodek commented Mar 13, 2026

Resolves #75.

I tested it with an IOC with the latest release of base, and I was now able to load iocAdminSoft.db.

@jwlodek
Copy link
Copy Markdown
Contributor Author

jwlodek commented Mar 16, 2026

I am not sure I understand the CI failures. They seem to be caused by a template I did not modify, while the one I did seems to be being generated fine. I also cannot seem to reproduce locally.

@simon-ess
Copy link
Copy Markdown
Contributor

Hm. I get the same when I run locally against the latest EPICS base. I believe it is due to this change: epics-base/epics-base#766

If I run locally after reverting it, then the build does pass. It's a bit unfortunate that the following errors do show up in the log regardless:

"/Users/simonrose/git/epics/epics-base/bin/darwin-aarch64/msi" -D    -I. -I.. -I../O.Common -I../../../db -I/Users/simonrose/git/epics/epics-base/db -o ../O.Common/iocAdminRTEMS.db -S../iocAdminRTEMS.substitutions  > iocAdminRTEMS.db.d.stdout
ERROR msi: Can't open file 'iocAdminScanMon.db'
input: '}
' at 
"/Users/simonrose/git/epics/epics-base/bin/darwin-aarch64/msi" -D    -I. -I.. -I../O.Common -I../../../db -I/Users/simonrose/git/epics/epics-base/db -o ../O.Common/iocAdminSoft.db -S../iocAdminSoft.substitutions  > iocAdminSoft.db.d.stdout
ERROR msi: Can't open file 'iocAdminScanMon.db'
input: '}
' at 
"/Users/simonrose/git/epics/epics-base/bin/darwin-aarch64/msi" -D    -I. -I.. -I../O.Common -I../../../db -I/Users/simonrose/git/epics/epics-base/db -o ../O.Common/iocAdminVxWorks.db -S../iocAdminVxWorks.substitutions  > iocAdminVxWorks.db.d.stdout
ERROR msi: Can't open file 'iocAdminScanMon.db'
input: '}
' at

However the build does recover from that issue when that one PR reverted. That said, it probably means I should actually clean up those errors...

For now if you build against 7.0.10 you will be fine. I will create an issue to clean this up.

@simon-ess
Copy link
Copy Markdown
Contributor

@jwlodek - please feel free to rebase and run the checks again.

Comment thread iocAdmin/Db/genSiteEnvVars.pl Outdated
@simon-ess
Copy link
Copy Markdown
Contributor

This looks good to me, but there are now merge conflicts...

@jwlodek
Copy link
Copy Markdown
Contributor Author

jwlodek commented Mar 30, 2026

I don't seem to see any merge conflicts, are you sure? I confirmed that my local branch is up to date with this PR as well as with the master branch.

jwlodek@alma10:~/Workspace/iocStats$ git branch
  convert-ioc-release-to-db-to-py3
  master
* truncate-epics-base-config-pvs
jwlodek@alma10:~/Workspace/iocStats$ git pull upstream master
From https://github.com/epics-modules/iocStats
 * branch            master     -> FETCH_HEAD
Already up to date.
jwlodek@alma10:~/Workspace/iocStats$ git remote -v
origin	https://github.com/jwlodek/iocStats.git (fetch)
origin	https://github.com/jwlodek/iocStats.git (push)
upstream	https://github.com/epics-modules/iocStats.git (fetch)
upstream	https://github.com/epics-modules/iocStats.git (push)
jwlodek@alma10:~/Workspace/iocStats$ git push
Everything up-to-date

@simon-ess
Copy link
Copy Markdown
Contributor

Screenshot 2026-03-30 at 15 43 57

Note that rebase and merge do not work.

I think that this can be cleaned up with a bit of a cleanup to the git history. If you are not comfortable with doing this I can do it.

@jwlodek jwlodek force-pushed the truncate-epics-base-config-pvs branch from c8afb0c to 275e5fc Compare March 30, 2026 15:15
@jwlodek
Copy link
Copy Markdown
Contributor Author

jwlodek commented Mar 30, 2026

Ok, I see. I think I've cleaned up the history now. Could you confirm that rebase/merge works now on your end?

@simon-ess simon-ess merged commit 9140a11 into epics-modules:master Mar 31, 2026
8 checks passed
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.

DESC field too long for new EPICS_ALLOW_POSIX_THREAD_PRIORITY_SCHEDULING CONFIG_ENV setting in EPICS_BASE

2 participants