3 Commits

Author SHA1 Message Date
Ralph Lange
fbbfced900 ci: add GHA builds for Base 3.15 and 3.14
Some checks failed
ci-scripts build/test / cross linux-arm@arm-linux-gnueabi / / default (push) Successful in 2m14s
ci-scripts build/test / cross linux-aarch64 / / default (push) Successful in 2m46s
ci-scripts build/test / cross linux-ppc / / default (push) Successful in 2m49s
ci-scripts build/test / cross linux-arm@arm-linux-gnueabihf / / default (push) Successful in 2m58s
ci-scripts build/test / cross linux-ppc64 / / default (push) Successful in 3m18s
ci-scripts build/test / cross RTEMS-pc386-qemu@4.10 / / default (push) Successful in 3m36s
ci-scripts build/test / cross RTEMS-pc386-qemu@4.9 / / default (push) Successful in 3m43s
ci-scripts build/test / cross win32-x86-mingw / / default (push) Successful in 3m26s
ci-scripts build/test / cross RTEMS-pc686-qemu@5 / / default (push) Successful in 4m28s
ci-scripts build/test / cross windows-x64-mingw / / default (push) Successful in 3m13s
ci-scripts build/test / B-7.0 clang debug @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-3.15 gcc default @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-3.15 gcc static @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / Unit tests on macos-14 (push) Has been cancelled
ci-scripts build/test / Unit tests on macos-15 (push) Has been cancelled
ci-scripts build/test / Unit tests on ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / Unit tests on ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / Unit tests on windows-2022 (push) Has been cancelled
ci-scripts build/test / Unit tests on windows-2025 (push) Has been cancelled
ci-scripts build/test / B-3.14 gcc default @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang debug @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-3.14 gcc static @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang default @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang default @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang static @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang static @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang static-debug @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang static-debug @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc debug @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc debug @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc default @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc default @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang default @ macos-15 (push) Has been cancelled
ci-scripts build/test / B-3.14 vs2022 static @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-3.15 vs2022 static @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc debug @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static-debug @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static-debug @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 debug @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 default @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 default @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 static @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static-debug @ ubuntu-22.04 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc static-debug @ ubuntu-24.04 (push) Has been cancelled
ci-scripts build/test / B-3.15 clang default @ macos-15 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang debug @ macos-14 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang debug @ macos-15 (push) Has been cancelled
ci-scripts build/test / B-7.0 clang default @ macos-14 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc debug @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc default @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 gcc default @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 debug @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 static @ windows-2025 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 static-debug @ windows-2022 (push) Has been cancelled
ci-scripts build/test / B-7.0 vs2022 static-debug @ windows-2025 (push) Has been cancelled
- caveat: 3.14 is not supported on MacOS @aarch64
2025-12-02 14:26:17 +01:00
Ralph Lange
d53ccd5b75 ci: fix 3.14 patch to remove readline dependency 2025-12-02 14:26:17 +01:00
Simon Rose
1244547af2 Skip using libreadline for base 3.14
In base 3.15 onwards we have checks for the existence of readline.h.
For base 3.14 we should just skip it.
2025-12-02 08:55:29 +01:00
3 changed files with 88 additions and 3 deletions

View File

@@ -28,17 +28,43 @@ jobs:
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-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@v4
- name: Prepare and compile dependencies
@@ -51,17 +77,32 @@ 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-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@v4
- name: Prepare and compile dependencies
@@ -74,18 +115,31 @@ 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-2025, windows-2022]
cmp: [gcc, vs2022]
configuration: [default, static, debug, static-debug]
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@v4
- name: Prepare and compile dependencies

7
cue.py
View File

@@ -618,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")

View File

@@ -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