Skip to content

Cleanup config and CI#214

Merged
MarkRivers merged 12 commits into
epics-modules:masterfrom
ralphlange:cleanup-config-and-ci
Feb 12, 2025
Merged

Cleanup config and CI#214
MarkRivers merged 12 commits into
epics-modules:masterfrom
ralphlange:cleanup-config-and-ci

Conversation

@ralphlange
Copy link
Copy Markdown
Member

@ralphlange ralphlange commented Jan 15, 2025 •
edited
Loading

This PR tries to get the asyn CI into a more reasonable state.

  • update ci-scripts-build configuration from Base and other modules
  • clean-up the settings mechanism and add settings for synapps releases
  • use more comprehensible names for jobs
  • fix failing 3.14 builds that were just commented
  • make the "current" jobs also use the current commits from dependencies
  • add jobs for MacOS and RTEMS-5 (see also Update CI build matrix #213)
  • don't build VXI11 support on RTEMS-5.

@ralphlange
Improve comment in Linux CONFIG_SITE, remove debris
4dc9dce
@ralphlange
ci: merge improvements from Base GitHub configuration
bc59a1c 
- improve job name
- bump versions v3->v4
  for actions/checkout and actions/upload-artifact
- make artifact name unique (needed for action v4)
@ralphlange
ci: install libtirpc-dev on Ubuntu runner
bc866b1 
- Ubuntu-24.04 runner (ubuntu-latest as of Jan 2025)
  doesn't have it pre-installed
@ralphlange
ci: minimize BASE_RECURSIVE=NO setting
b2b6ac0
@ralphlange
ci: improve job names; fix artifact upload
3d70efe
@ralphlange
ci: install Base prerequisites on GHA runners
014cc5e 
- add libreadline-dev
@ralphlange
ci: reorganize job settings
1fb06ad 
- remove unnecessary settings
- create settings for synapps 5.8, 6.0 and 6.3
- use these settings in the ci-scripts-build
- use reasonable defaults
- make the default builds use dependency defaults
@ralphlange
ci: build synapps-sets on Base branches (not releases)
e7081cf
@ralphlange
ci: add job for MacOS
5fe0a49
@ralphlange
ci: add patch for sscan-2.10.1 (synapps-5.8)
52639b8
@ralphlange
Copy link
Copy Markdown
Member Author

ralphlange commented Jan 15, 2025

@tboegi has an open PR (#153) to fix the RTEMS-5 issue.

@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented Jan 15, 2025

❌ Build asyn 1.0.286 failed (commit b5c3491063 by @ralphlange)

@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented Jan 18, 2025

❌ Build asyn 1.0.287 failed (commit 678c1c52de by @ralphlange)

@ralphlange ralphlange force-pushed the cleanup-config-and-ci branch from caaf25b to 52dda2b Compare January 18, 2025 13:57
@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented Jan 19, 2025

❌ Build asyn 1.0.288 failed (commit 2c03bd23b8 by @ralphlange)

@ralphlange
ci: update AppVeyor setup
f6b6265 
- integrate features/changes from Base
- use the new setup files
- 'cinst' -> 'choco install' (Chocolatey dropped the alias)
@ralphlange ralphlange force-pushed the cleanup-config-and-ci branch from 52dda2b to f6b6265 Compare January 19, 2025 09:40
@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented Jan 20, 2025

❌ Build asyn 1.0.289 failed (commit 8abff135ba by @ralphlange)

@ralphlange ralphlange requested a review from MarkRivers January 30, 2025 13:30
@ralphlange
Copy link
Copy Markdown
Member Author

ralphlange commented Jan 30, 2025

@hjunkes @MarkRivers I think this is ready for review (and merge) now.

@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented Jan 31, 2025

❌ Build asyn 1.0.292 failed (commit 6e7cc2fb9a by @hjunkes)

MarkRivers
MarkRivers approved these changes Feb 12, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@MarkRivers MarkRivers 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 to me.

@MarkRivers MarkRivers merged commit 388bf32 into epics-modules:master Feb 12, 2025
@MarkRivers
Copy link
Copy Markdown
Member

MarkRivers commented May 18, 2026

@ralphlange and @hjunkes I would like to revisit part of this PR.

I don't like the fact that VXI-11 is now disabled for all architectures by default, because DRV_VXI11 is commented out in CONFIG_SITE. All Linux and Windows users need to edit CONFIG_SITE to enable this, when it was previously enabled by default.

I have 2 questions:

  • The new version of asyn/Makefile sets DRV_VXI11=NO for RTEMS:

    asyn/asyn/Makefile

    Line 247 in 87f952e

    DRV_VXI11 = NO

    Why isn't this sufficient?
  • If that is not sufficient then I think it would be preferable to add configure/CONFIG_SITE.RTEMS (or whatever the syntax for that is) with DRV_VX11=NO and let DRV_VX11=YES be the default in CONFIG_SITE.

@ralphlange
Copy link
Copy Markdown
Member Author

ralphlange commented May 18, 2026

Sounds reasonable. I'll look into it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MarkRivers MarkRivers MarkRivers approved these changes

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ralphlange @AppVeyorBot @MarkRivers @hjunkes