ci: add GHA builds for Base 3.15 and 3.14

- caveat: 3.14 is not supported on MacOS @aarch64

.appveyor.yml

@@ -45,9 +45,9 @@ skip_commits:
 
 install:
 # fetch submodules (like ci-scripts)
-  - cmd: git submodule update --init --recursive
+  - git submodule update --init --recursive
 # for the sequencer
-  - cinst re2c
+  - choco install re2c
 
 #---------------------------------#
 #   build matrix configuration    #

.github/workflows/build-and-test.yml

@@ -19,28 +19,54 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2022, windows-2019, macos-12, macos-11]
+        os: [ubuntu-24.04, ubuntu-22.04, windows-2025, windows-2022, macos-15, macos-14]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Show initial environment
-      run: python cue-test.py env
+      run: python3 cue-test.py env
     - name: Run unit tests
-      run: python cue-test.py
+      run: python3 cue-test.py
 
   build-linux:
-    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    name: B-${{ matrix.base }} ${{ matrix.cmp }} ${{ matrix.configuration }} @ ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
+      BASE: ${{ matrix.base }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
+        os: [ubuntu-24.04, ubuntu-22.04]
         cmp: [gcc, clang]
         configuration: [default, static, debug, static-debug]
+        base: ["7.0"]
+        include:
+          - os: ubuntu-24.04
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+            name: "B-3.15 Ub-24 gcc-13"
+
+          - os: ubuntu-24.04
+            cmp: gcc
+            configuration: static
+            base: "3.15"
+            name: "B-3.15 Ub-24 gcc-13, static"
+
+          - os: ubuntu-24.04
+            cmp: gcc
+            configuration: default
+            base: "3.14"
+            name: "B-3.14 Ub-24 gcc-13"
+
+          - os: ubuntu-24.04
+            cmp: gcc
+            configuration: static
+            base: "3.14"
+            name: "B-3.14 Ub-24 gcc-13, static"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Prepare and compile dependencies
       run: python cue.py prepare
     - name: Build main module (example app)
@@ -51,19 +77,34 @@ jobs:
       run: python cue.py test-results
 
   build-macos:
-    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    name: B-${{ matrix.base }} ${{ matrix.cmp }} ${{ matrix.configuration }} @ ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
+      BASE: ${{ matrix.base }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-11]
+        os: [macos-15, macos-14]
         cmp: [clang]
         configuration: [default, debug]
+        base: ["7.0"]
+        include:
+          - os: macos-15
+            cmp: clang
+            configuration: default
+            base: "3.15"
+            name: "B-3.15 Mac-15"
+
+# Base 3.14 does not support MacOS-aarch64
+#          - os: macos-15
+#            cmp: clang
+#            configuration: default
+#            base: "3.14"
+#            name: "B-3.14 Mac-15"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Prepare and compile dependencies
       run: python cue.py prepare
     - name: Build main module (example app)
@@ -74,26 +115,33 @@ jobs:
       run: python cue.py test-results
 
   build-windows:
-    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    name: B-${{ matrix.base }} ${{ matrix.cmp }} ${{ matrix.configuration }} @ ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
+      BASE: ${{ matrix.base }}
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, windows-2019]
-        cmp: [gcc, vs2022, vs2019]
+        os: [windows-2025, windows-2022]
+        cmp: [gcc, vs2022]
         configuration: [default, static, debug, static-debug]
-        exclude:
-          - os: windows-2022
-            cmp: vs2019
-
-          - os: windows-2019
+        base: [ "7.0" ]
+        include:
+          - os: windows-2025
             cmp: vs2022
+            configuration: static
+            base: "3.15"
+            name: "B-3.15 Win-25 MSC-22 static"
 
+          - os: windows-2025
+            cmp: vs2022
+            configuration: static
+            base: "3.14"
+            name: "B-3.14 Win-25 MSC-22 static"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Prepare and compile dependencies
       run: python cue.py prepare
     - name: Build main module (example app)
@@ -105,18 +153,19 @@ jobs:
 
   build-cross:
     name: cross ${{ matrix.cross }} / ${{ matrix.cmp }} / ${{ matrix.configuration }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       CMP: gcc
       BCFG: default
       CI_CROSS_TARGETS: ${{ matrix.cross }}
+      TEST: ${{ matrix.test }}
       APT: re2c
     strategy:
       fail-fast: false
       matrix:
         # configuration: [default, static, debug, static-debug]
         configuration: [default]
-        cross: 
+        cross:
         - linux-aarch64
         - linux-arm@arm-linux-gnueabi
         - linux-arm@arm-linux-gnueabihf
@@ -127,8 +176,11 @@ jobs:
         - RTEMS-pc386-qemu@4.9
         - RTEMS-pc386-qemu@4.10
         - RTEMS-pc686-qemu@5
+        include:
+        - cross: RTEMS-pc386-qemu@4.10
+          test: NO
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Prepare and compile dependencies
       run: python cue.py prepare
     - name: Build main module (example app)

README.md

@@ -189,6 +189,19 @@ Collect the results of your tests and print a summary.
 `exec`\
 Execute the remainder of the line using the default command shell.
 
+## Extra arguments to `make`
+
+You can add additional arguments to the make runs that the `cue.py` script
+starts. Put your additional arguments into environment variables named
+`EXTRA`, `EXTRA1`, ... `EXTRA5`.
+
+The variables may contain multiple arguments, separated by whitespace.
+Use regular shell script quoting (single/double quotes, backslash escapes)
+if you need spaces inside an extra argument.
+
+The YAML syntax needed to set environment variables depends on the CI
+service and platform. (See the full example configuration file.)
+
 ## Setup Files
 
 Your module might depend on EPICS Base and a few other support modules.

appveyor/.appveyor.yml.example-full

@@ -41,9 +41,9 @@ skip_commits:
 
 install:
 # fetch submodules (like ci-scripts)
-  - cmd: git submodule update --init --recursive
+  - git submodule update --init --recursive
 # for the sequencer
-  - cinst re2c
+  - choco install re2c
 
 #---------------------------------#
 #   build matrix configuration    #

appveyor/.appveyor.yml.example-mini

@@ -18,7 +18,7 @@ skip_commits:
     - '.travis.yml'
 
 install:
-  - cmd: git submodule update --init --recursive
+  - git submodule update --init --recursive
 
 image: Visual Studio 2022
 

cue-test.py

@@ -8,7 +8,6 @@
 from __future__ import print_function
 
 import sys, os, shutil, fileinput
-import distutils.util
 import re
 import subprocess as sp
 import unittest
@@ -81,10 +80,10 @@ class TestSourceSet(unittest.TestCase):
 
     def test_EmptySetupDirsPath(self):
         del os.environ['SETUP_PATH']
-        self.assertRaisesRegexp(NameError, '\(SETUP_PATH\) is empty', cue.source_set, 'test01')
+        self.assertRaisesRegex(NameError, '\(SETUP_PATH\) is empty', cue.source_set, 'test01')
 
     def test_InvalidSetupName(self):
-        self.assertRaisesRegexp(NameError, 'does not exist in SETUP_PATH', cue.source_set, 'xxdoesnotexistxx')
+        self.assertRaisesRegex(NameError, 'does not exist in SETUP_PATH', cue.source_set, 'xxdoesnotexistxx')
 
     def test_ValidSetupName(self):
         capturedOutput = getStringIO()
@@ -121,7 +120,7 @@ class TestSourceSet(unittest.TestCase):
         sys.stdout = capturedOutput
         cue.source_set('test03')
         sys.stdout = sys.__stdout__
-        self.assertRegexpMatches(capturedOutput.getvalue(), 'Ignoring already included setup file')
+        self.assertRegex(capturedOutput.getvalue(), 'Ignoring already included setup file')
 
 
 class TestUpdateReleaseLocal(unittest.TestCase):
@@ -270,12 +269,12 @@ class TestAddDependencyOptions(unittest.TestCase):
         cue.detect_context()
         if os.path.exists(cue.ci['cachedir']):
             shutil.rmtree(cue.ci['cachedir'], onerror=cue.remove_readonly)
-        self.location = os.path.join(cue.ci['cachedir'], 'mcoreutils-master')
+        self.location = os.path.join(cue.ci['cachedir'], 'mcoreutils-main')
         self.testfile = os.path.join(self.location, '.ci', 'LICENSE')
-        os.path.join(cue.ci['cachedir'], 'mcoreutils-master')
+        os.path.join(cue.ci['cachedir'], 'mcoreutils-main')
         cue.source_set('defaults')
         cue.complete_setup('MCoreUtils')
-        cue.setup['MCoreUtils'] = 'master'
+        cue.setup['MCoreUtils'] = 'main'
 
     def test_Default(self):
         cue.add_dependency('MCoreUtils')
@@ -530,7 +529,7 @@ class TestTravisDetectContext(unittest.TestCase):
         sys.stdout = capturedOutput
         cue.detect_context()
         sys.stdout = sys.__stdout__
-        self.assertRegexpMatches(capturedOutput.getvalue(), "Variable 'STATIC' not supported anymore")
+        self.assertRegex(capturedOutput.getvalue(), "Variable 'STATIC' not supported anymore")
 
     def test_MisspelledBcfgGetsWarning(self):
         os.environ['BCFG'] = 'static-dubug'
@@ -538,7 +537,7 @@ class TestTravisDetectContext(unittest.TestCase):
         sys.stdout = capturedOutput
         cue.detect_context()
         sys.stdout = sys.__stdout__
-        self.assertRegexpMatches(capturedOutput.getvalue(), "Unrecognized build configuration setting")
+        self.assertRegex(capturedOutput.getvalue(), "Unrecognized build configuration setting")
 
 
 @unittest.skipIf(ci_service != 'appveyor', 'Run appveyor tests only on appveyor')
@@ -691,7 +690,7 @@ class TestAppveyorDetectContext(unittest.TestCase):
         sys.stdout = capturedOutput
         cue.detect_context()
         sys.stdout = sys.__stdout__
-        self.assertRegexpMatches(capturedOutput.getvalue(), "Variable 'STATIC' not supported anymore")
+        self.assertRegex(capturedOutput.getvalue(), "Variable 'STATIC' not supported anymore")
 
     def test_MisspelledConfigurationGetsWarning(self):
         os.environ['CONFIGURATION'] = 'static-dubug'
@@ -699,11 +698,11 @@ class TestAppveyorDetectContext(unittest.TestCase):
         sys.stdout = capturedOutput
         cue.detect_context()
         sys.stdout = sys.__stdout__
-        self.assertRegexpMatches(capturedOutput.getvalue(), "Unrecognized build configuration setting")
+        self.assertRegex(capturedOutput.getvalue(), "Unrecognized build configuration setting")
 
 
 class TestSetupForBuild(unittest.TestCase):
-    args = Namespace(paths=[])
+    args = Namespace(extra_env_vars=[])
     if ci_os == 'windows':
         choco_installs = ['make']
         if ci_service != 'appveyor':
@@ -722,7 +721,7 @@ class TestSetupForBuild(unittest.TestCase):
 
     def test_AddPathsOption(self):
         os.environ['FOOBAR'] = 'BAR'
-        args = Namespace(paths=['/my/{FOOBAR}/dir', '/my/foobar'])
+        args = Namespace(extra_env_vars=['PATH=/my/{FOOBAR}/dir', 'PATH=/my/foobar'])
         cue.setup_for_build(args)
         self.assertTrue(re.search('/my/BAR/dir', os.environ['PATH']), 'Expanded path not in PATH')
         self.assertTrue(re.search('/foobar', os.environ['PATH']), 'Plain path not in PATH')
@@ -841,7 +840,7 @@ class TestSetupForBuild(unittest.TestCase):
     def test_ExtraMakeArgs(self):
         os.environ['EXTRA'] = 'bla'
         for ind in range(1,5):
-            os.environ['EXTRA{0}'.format(ind)] = 'bla {0}'.format(ind)
+            os.environ['EXTRA{0}'.format(ind)] = '"bla {0}"'.format(ind)
         cue.setup_for_build(self.args)
         self.assertTrue(cue.extra_makeargs[0] == 'bla', 'Extra make arg [0] not set')
         for ind in range(1,5):
@@ -864,7 +863,8 @@ class TestHooks(unittest.TestCase):
             pass
         with open(self.bla_file, 'w') as f:
             f.write('''LINE1=YES
-LINE2=NO''')
+LINE2=NO
+''')
 
     def test_patchfile(self):
         hook = os.path.join(builddir, 'test.patch')
@@ -888,7 +888,7 @@ LINE2=NO''')
 
 @unittest.skipIf(ci_os != 'linux', 'CrossCompatibilityHandling tests only apply to linux')
 class TestCrossCompatibilityHandling(unittest.TestCase):
-    args = Namespace(paths=[])
+    args = Namespace(extra_env_vars=[])
 
     def setUp(self):
         cue.clear_lists()

cue.py

@@ -4,14 +4,22 @@
 
 from __future__ import print_function
 
-import sys, os, stat, shutil
+import sys, os, stat, shlex, shutil
 import fileinput
 import logging
 import re
+import time
 import threading
 from glob import glob
 import subprocess as sp
-import distutils.util
+import sysconfig
+import shutil
+
+try:
+    from os import cpu_count
+except ImportError:
+    def cpu_count():
+        pass # undetermined
 
 logger = logging.getLogger(__name__)
 
@@ -31,6 +39,11 @@ def log_modified():
                 sys.stdout.write(F.read())
             sys.stdout.write(os.linesep)
 
+def whereis(cmd):
+    if hasattr(shutil, 'which'): # >= py3.3
+        loc = shutil.which(cmd)
+        print('{0}Found exec {1} at {2!r} {3}'.format(ANSI_CYAN, cmd, loc, ANSI_RESET))
+
 def prepare_env():
     '''HACK
     github actions yaml configuration doesn't allow
@@ -129,7 +142,10 @@ def detect_context():
         ci['cachedir'] = os.environ['CACHEDIR']
 
     if 'CHOCO' in os.environ:
-        ci['choco'].extend(os.environ['CHOCO'].split())
+        if os.environ['CHOCO'] == 'NO':
+            ci['choco'] = []
+        else:
+            ci['choco'].extend(os.environ['CHOCO'].split())
 
     if 'APT' in os.environ:
         ci['apt'].extend(os.environ['APT'].split())
@@ -141,7 +157,7 @@ def detect_context():
     if 'TEST' in os.environ and os.environ['TEST'].lower() == 'no':
         ci['test'] = False
 
-    ci['parallel_make'] = 2
+    ci['parallel_make'] = cpu_count() or 2
     if 'PARALLEL_MAKE' in os.environ:
         ci['parallel_make'] = int(os.environ['PARALLEL_MAKE'])
 
@@ -313,7 +329,7 @@ def host_info():
     print('PYTHONPATH')
     for dname in sys.path:
         print(' ', dname)
-    print('platform =', distutils.util.get_platform())
+    print('platform =', sysconfig.get_platform())
 
     if ci['os'] == 'windows':
         print('{0}Available Visual Studio versions{1}'.format(ANSI_CYAN, ANSI_RESET))
@@ -421,9 +437,11 @@ def update_release_local(var, location):
 def set_setup_from_env(dep):
     for postf in ['', '_DIRNAME', '_REPONAME', '_REPOOWNER', '_REPOURL',
                   '_VARNAME', '_RECURSIVE', '_DEPTH', '_HOOK']:
-        if dep + postf in os.environ:
-            setup[dep + postf] = os.environ[dep + postf]
-            logger.debug('ENV assignment: %s = %s', dep + postf, setup[dep + postf])
+        env = dep + postf
+        val = os.environ.get(env)
+        if val:
+            setup[env] = val
+            logger.debug('ENV assignment: %s = %s', env, setup[env])
 
 
 def call_git(args, **kws):
@@ -600,6 +618,13 @@ def add_dependency(dep):
                         sys.stdout.flush()
                         sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'add-msi-to-314.patch')],
                                       cwd=place)
+
+                        # Post 3.14 we have checks for readline.h
+                        print('Patching COMMANDLINE_LIBRARY to EPICS')
+                        sys.stdout.flush()
+                        sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'dont_use_readline_314.patch')],
+                                      cwd=place)
+
         else:
             # force including RELEASE.local for non-base modules by overwriting their configure/RELEASE
             release = os.path.join(place, "configure", "RELEASE")
@@ -686,8 +711,10 @@ def setup_for_build(args):
     if ci['os'] == 'windows':
         if os.path.exists(r'C:\Strawberry\perl\bin'):
             # Put strawberry perl in front of the PATH (so that Git Perl is further behind)
+            # Put Chocolatey\bin ahead to select correct make.exe
             logger.debug('Adding Strawberry Perl in front of the PATH')
-            os.environ['PATH'] = os.pathsep.join([r'C:\Strawberry\c\bin',
+            os.environ['PATH'] = os.pathsep.join([r'C:\ProgramData\Chocolatey\bin',
+                                                  r'C:\Strawberry\c\bin',
                                                   r'C:\Strawberry\perl\site\bin',
                                                   r'C:\Strawberry\perl\bin',
                                                   os.environ['PATH']])
@@ -755,30 +782,52 @@ def setup_for_build(args):
                     if re.match('^test-results:', line):
                         has_test_results = True
 
-    # Check make version
-    if re.match(r'^GNU Make 3', sp.check_output(['make', '-v']).decode('ascii')):
-        is_make3 = True
-    logger.debug('Check if make is a 3.x series: %s', is_make3)
-
-    # apparently %CD% is handled automagically
+    # apparently %CD% is handled automagically, so use getcwd() instead
     os.environ['TOP'] = os.getcwd()
+    os.environ['MAKE'] = 'make'
+    os.environ['EPICS_BASE'] = places['EPICS_BASE']
 
-    addpaths = []
-    for path in args.paths:
+    changed_vars = set()
+
+    for extra_env_var in args.extra_env_vars:
         try:
-            addpaths.append(path.format(**os.environ))
+            key_value = extra_env_var.split('=')
+            key = key_value[0]
+            value = key_value[1]
+            expanded_value = value.format(**os.environ)
+
+            # Update the environment right now so later variables have access
+            if key in os.environ:
+                old_value = [os.environ[key]]
+            else:
+                old_value = []
+
+            os.environ[key] = os.pathsep.join(old_value + [expanded_value])
+            changed_vars.add(key)
         except KeyError:
             print('Environment')
             [print('  ', K, '=', repr(V)) for K, V in os.environ.items()]
             raise
 
-    os.environ['PATH'] = os.pathsep.join([os.environ['PATH']] + addpaths)
+    for key in changed_vars:
+        print("{0}{2} = {3}{1}".format(ANSI_CYAN, ANSI_RESET, key, os.environ[key]))
+
+    # os.environ completely updated at this point
+
+    logger.debug('Final PATH')
+    for loc in os.environ['PATH'].split(os.pathsep):
+        logger.debug('  %r', loc)
+
+    # Check make version
+    if re.match(r'^GNU Make 3', sp.check_output(['make', '-v']).decode('ascii')):
+        is_make3 = True
+    logger.debug('Check if make is a 3.x series: %s', is_make3)
 
     # Add EXTRA make arguments
     for tag in ['EXTRA', 'EXTRA1', 'EXTRA2', 'EXTRA3', 'EXTRA4', 'EXTRA5']:
         val = os.environ.get(tag, "")
         if len(val)>0:
-            extra_makeargs.append(val)
+            extra_makeargs.extend(shlex.split(val))
 
 
 def fix_etc_hosts():
@@ -829,9 +878,8 @@ def handle_old_cross_variables():
         os.environ["CI_CROSS_TARGETS"] = ""
 
     if "RTEMS" in os.environ:
-        if 'RTEMS_TARGET' in os.environ:
-            rtems_target = os.environ['RTEMS_TARGET']
-        else:
+        rtems_target = os.environ.get('RTEMS_TARGET')
+        if not rtems_target:
             if os.environ['RTEMS'] == '5':
                 rtems_target = 'RTEMS-pc686-qemu'
             else:
@@ -855,8 +903,10 @@ def handle_old_cross_variables():
     if "WINE" in os.environ:
         if os.environ['WINE'] == '32':
             new_cross_target = ":win32-x86-mingw"
-        else:
+        elif os.environ['WINE'] == '64':
             new_cross_target = ":windows-x64-mingw"
+        else:
+            raise RuntimeError("Invalid $WINE, must be 32/64")
         os.environ["CI_CROSS_TARGETS"] += new_cross_target
 
         print(
@@ -1208,11 +1258,27 @@ PERL = C:/Strawberry/perl/bin/perl -CSD'''
             with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG_SITE'), 'a') as f:
                 f.write(extra_config)
 
+        # enable color in error and warning messages if the (cross) compiler supports it
+        with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG'), 'a') as f:
+            f.write('''
+ifdef T_A
+  COLOR_FLAG_$(T_A) := $(shell $(CPP) -fdiagnostics-color -E - </dev/null >/dev/null 2>/dev/null && echo -fdiagnostics-color)
+  USR_CPPFLAGS += $(COLOR_FLAG_$(T_A))
+endif''')
+
         fold_end('set.up.epics_build', 'Configuring EPICS build system')
 
     if ci['os'] == 'windows' and ci['choco']:
         fold_start('install.choco', 'Installing CHOCO packages')
-        sp.check_call(['choco', 'install'] + ci['choco'] + ['-y', '--limitoutput', '--no-progress'])
+        for i in range(0,3):
+            try:
+                sp.check_call(['choco', 'install'] + ci['choco'] + ['-y', '--limitoutput', '--no-progress'])
+            except Exception as e:
+                print(e)
+                print("Retrying choco install attempt {} after 30 seconds".format(i+1))
+                time.sleep(30)
+            else:
+                break
         fold_end('install.choco', 'Installing CHOCO packages')
 
     if ci['os'] == 'linux' and ci['apt']:
@@ -1229,23 +1295,28 @@ PERL = C:/Strawberry/perl/bin/perl -CSD'''
     setup_for_build(args)
 
     print('{0}EPICS_HOST_ARCH = {1}{2}'.format(ANSI_CYAN, os.environ['EPICS_HOST_ARCH'], ANSI_RESET))
+    whereis('make')
     print('{0}$ make --version{1}'.format(ANSI_CYAN, ANSI_RESET))
     sys.stdout.flush()
     call_make(['--version'], parallel=0)
+    whereis('perl')
     print('{0}$ perl --version{1}'.format(ANSI_CYAN, ANSI_RESET))
     sys.stdout.flush()
     sp.check_call(['perl', '--version'])
 
     if re.match(r'^vs', ci['compiler']):
+        whereis('cl')
         print('{0}$ cl{1}'.format(ANSI_CYAN, ANSI_RESET))
         sys.stdout.flush()
         sp.check_call(['cl'])
     else:
         cc = ci['compiler']
+        whereis(cc)
         print('{0}$ {1} --version{2}'.format(ANSI_CYAN, cc, ANSI_RESET))
         sys.stdout.flush()
         sp.check_call([cc, '--version'])
         if cxx:
+            whereis(cxx)
             print('{0}$ {1} --version{2}'.format(ANSI_CYAN, cxx, ANSI_RESET))
             sys.stdout.flush()
             sp.check_call([cxx, '--version'])
@@ -1318,8 +1389,6 @@ def test_results(args):
 def doExec(args):
     'exec user command with vcvars'
     setup_for_build(args)
-    os.environ['MAKE'] = 'make'
-    os.environ['EPICS_BASE'] = places['EPICS_BASE']
     fold_start('exec.command', 'Execute command {}'.format(args.cmd))
     sp.check_call(' '.join(args.cmd), shell=True)
     fold_end('exec.command', 'Execute command {}'.format(args.cmd))
@@ -1389,8 +1458,10 @@ def getargs():
     p = ArgumentParser()
     p.add_argument('--no-vcvars', dest='vcvars', default=True, action='store_false',
                    help='Assume vcvarsall.bat has already been run')
-    p.add_argument('--add-path', dest='paths', default=[], action='append',
-                   help='Append directory to $PATH or %%PATH%%.  Expands {ENVVAR}')
+    p.add_argument('--add-path', dest='extra_env_vars', type=lambda x: "PATH={}".format(x), default=[], action='append',
+                   help='Append directory to $PATH or %%PATH%%. Expands {ENVVAR}. Equivalent to: "--add-env PATH=<PATHS>"')
+    p.add_argument('--add-env', dest='extra_env_vars', default=[], action='append',
+                   help='Append directory to the specified $ENVVAR or %%ENVVAR%%. Expands {OTHER_ENVVAR}. Example: "--add-env \'LD_LIBRARY_PATH={EPICS_BASE}/lib/{EPICS_HOST_ARCH}\'"')
     p.add_argument('-T', '--timeout', type=timespec, metavar='DLY',
                    help='Terminate make after delay.  DLY interpreted as second, or may be qualified with "S", "M", or "H".  (default no timeout)')
     subp = p.add_subparsers()

defaults.set

@@ -18,7 +18,7 @@ NTYPES_REPONAME=normativeTypesCPP
 NTYPES_REPOOWNER=epics-base
 
 # Sequencer
-SNCSEQ_REPOURL=https://www-csr.bessy.de/control/SoftDist/sequencer/repo/branch-2-2.git
+SNCSEQ_REPOURL=https://github.com/mdavidsaver/sequencer-mirror.git
 SNCSEQ_DEPTH=0
 SNCSEQ_DIRNAME=seq
 

dont_use_readline_314.patch

@@ -0,0 +1,24 @@
+diff -urN a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86
+--- a/configure/os/CONFIG_SITE.Common.linux-x86	2023-02-08 18:55:20.000000000 +0100
++++ b/configure/os/CONFIG_SITE.Common.linux-x86	2025-12-02 10:56:20.064200334 +0100
+@@ -22,7 +22,7 @@
+ # comment them all out to build without readline support.
+ 
+ # No other libraries needed (recent Fedora, Ubuntu etc.):
+-COMMANDLINE_LIBRARY = READLINE
++#COMMANDLINE_LIBRARY = READLINE
+ 
+ # Needs -lncurses (RHEL 5 etc.):
+ #COMMANDLINE_LIBRARY = READLINE_NCURSES
+diff -urN a/configure/os/CONFIG_SITE.Common.linux-x86_64 b/configure/os/CONFIG_SITE.Common.linux-x86_64
+--- a/configure/os/CONFIG_SITE.Common.linux-x86_64	2023-02-08 18:55:20.000000000 +0100
++++ b/configure/os/CONFIG_SITE.Common.linux-x86_64	2025-12-02 10:56:28.328188418 +0100
+@@ -22,7 +22,7 @@
+ # comment them all out to build without readline support.
+ 
+ # No other libraries needed (recent Fedora, Ubuntu etc.):
+-COMMANDLINE_LIBRARY = READLINE
++#COMMANDLINE_LIBRARY = READLINE
+ 
+ # Needs -lncurses (RHEL 5 etc.):
+ #COMMANDLINE_LIBRARY = READLINE_NCURSES

github-actions/ci-scripts-build.yml.example-full

@@ -41,113 +41,57 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             cmp: gcc
             configuration: default
             wine: "64"
-            name: "Ub-20 gcc-9 + MinGW"
+            name: "Ub-24 gcc + MinGW"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             cmp: gcc
             configuration: static
             wine: "64"
-            name: "Ub-20 gcc-9 + MinGW, static"
+            name: "Ub-24 gcc + MinGW, static"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             cmp: gcc
             configuration: static
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 gcc-9 C++11, static"
+            name: "Ub-24 gcc C++11, static"
 
-          - os: ubuntu-18.04
-            cmp: clang
-            configuration: default
-            name: "Ub-18 clang-9"
-
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             cmp: clang
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 clang-10 C++11"
+            name: "Ub-24 clang C++11"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             cmp: gcc
             configuration: default
-            rtems: "4.10"
-            name: "Ub-20 gcc-9 + RT-4.10"
+            cross: "RTEMS-pc686-qemu@5"
+            name: "Ub-22 gcc + RT-5.1 pc686"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             cmp: gcc
             configuration: default
-            rtems: "4.9"
-            name: "Ub-20 gcc-9 + RT-4.9"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-pc686-qemu
-            name: "Ub-20 gcc-9 + RT-5.1 pc686"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-beatnik
+            cross: "RTEMS-beatnik@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
+            name: "Ub-22 gcc + RT-5.1 beatnik"
 
-          - os: ubuntu-18.04
+          - os: macos-latest
+            cmp: clang
+            configuration: default
+            name: "MacOS clang"
+
+          - os: windows-2022
             cmp: gcc
             configuration: default
-            name: "Ub-18 gcc-7"
+            name: "Win2022 MinGW"
 
-          - os: ubuntu-18.04
-            cmp: gcc-8
-            utoolchain: true
-            configuration: default
-            name: "Ub-18 gcc-8"
-
-          - os: ubuntu-20.04
-            cmp: gcc-8
-            utoolchain: true
-            configuration: default
-            name: "Ub-20 gcc-8"
-
-          - os: ubuntu-20.04
-            cmp: clang
-            configuration: default
-            name: "Ub-20 clang-10"
-
-          - os: macos-11
-            cmp: clang
-            configuration: default
-            name: "MacOS clang-13"
-
-          - os: macos-12
-            cmp: clang
-            configuration: default
-            name: "MacOS clang-13"
-
-          - os: windows-2019
-            cmp: gcc
-            configuration: default
-            name: "Win2019 MinGW"
-
-          - os: windows-2019
+          - os: windows-2022
             cmp: gcc
             configuration: static
-            name: "Win2019 MinGW, static"
-
-          - os: windows-2019
-            cmp: vs2019
-            configuration: default
-            name: "Win2019 MSC-19"
-
-          - os: windows-2019
-            cmp: vs2019
-            configuration: static
-            name: "Win2019 MSC-19, static"
+            name: "Win2022 MinGW, static"
 
           - os: windows-2022
             cmp: vs2022
@@ -159,8 +103,14 @@ jobs:
             configuration: static
             name: "Win2022 MSC-22, static"
 
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-aarch64"
+            cross: linux-aarch64
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -170,13 +120,6 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
       if: runner.os == 'Linux'
-    - name: "apt-get install ${{ matrix.cmp }}"
-      run: |
-        sudo apt-get -y install software-properties-common
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get -y install ${{ matrix.cmp }}
-      if: matrix.utoolchain
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module
@@ -184,44 +127,10 @@ jobs:
     - name: Run main module tests
       run: python .ci/cue.py -T 15M test
     - name: Upload tapfiles Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
     - name: Collect and show test results
-      run: python .ci/cue.py test-results
-
-  build-cross:
-    name: cross ${{ matrix.cross }} / ${{ matrix.cmp }} / ${{ matrix.configuration }}
-    runs-on: ubuntu-20.04
-    env:
-      CMP: gcc
-      BCFG: default
-      CI_CROSS_TARGETS: ${{ matrix.cross }}
-      APT: re2c
-    strategy:
-      fail-fast: false
-      matrix:
-        # configuration: [default, static, debug, static-debug]
-        configuration: [default]
-        cross:
-        - linux-aarch64
-        - linux-arm@arm-linux-gnueabi
-        - linux-arm@arm-linux-gnueabihf
-        - linux-ppc
-        - linux-ppc64
-        - win32-x86-mingw
-        - windows-x64-mingw
-        - RTEMS-pc386-qemu@4.9
-        - RTEMS-pc386-qemu@4.10
-        - RTEMS-pc686-qemu@5
-    steps:
-    - uses: actions/checkout@v2
-    - name: Prepare and compile dependencies
-      run: python cue.py prepare
-    - name: Build main module
-      run: python cue.py build
-    - name: Run main module tests
-      run: python cue.py -T 15M test
-    - name: Collect and show test results
-      run: python cue.py test-results
+      if: ${{ always() }}
+      run: python .ci/cue.py -T 5M test-results

github-actions/ci-scripts-build.yml.example-mini

@@ -31,44 +31,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        - os: ubuntu-18.04
-          cmp: gcc
-          configuration: default
-          base: "7.0"
-          name: "7.0 Ub-18 gcc-7"
-
-        - os: ubuntu-18.04
-          cmp: gcc
-          configuration: static
-          base: "7.0"
-          name: "7.0 Ub-18 gcc-7 static"
-
-        - os: ubuntu-20.04
+      include:
+        - os: ubuntu-24.04
           cmp: gcc
           configuration: default
           base: "3.15"
-          name: "3.15 Ub-20 gcc-9"
+          name: "3.15 Ub-24 gcc"
 
-        - os: ubuntu-20.04
+        - os: ubuntu-24.04
+          cmp: gcc
+          configuration: default
+          base: "7.0"
+          name: "7.0 Ub-24 gcc"
+
+        - os: ubuntu-24.04
           cmp: gcc
           configuration: static
           base: "3.15"
-          name: "3.15 Ub-20 gcc-9 static"
+          name: "3.15 Ub-24 gcc static"
 
-        - os: ubuntu-20.04
+        - os: ubuntu-24.04
           cmp: gcc
           configuration: debug
           base: "3.15"
-          name: "3.15 Ub-20 gcc-9 debug"
+          name: "3.15 Ub-24 gcc debug"
 
-        - os: ubuntu-20.04
+        - os: ubuntu-24.04
           cmp: clang
           configuration: default
           base: "3.15"
-          name: "3.15 Ub-20 clang-10"
+          name: "3.15 Ub-24 clang"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Prepare and compile dependencies

test.patch

@@ -1,7 +1,7 @@
 diff -ruN a/bla.txt b/bla.txt
 --- a/bla.txt	2020-06-19 18:54:43.129076711 +0200
 +++ b/bla.txt	2020-06-19 18:55:05.093948316 +0200
-@@ -1,3 +1,3 @@
+@@ -1,2 +1,2 @@
 -LINE1=YES
 +LINE1=NO
  LINE2=NO