Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbbfced900 | ||
|
|
d53ccd5b75 | ||
|
|
1244547af2 |
60
.github/workflows/build-and-test.yml
vendored
60
.github/workflows/build-and-test.yml
vendored
@@ -28,17 +28,43 @@ jobs:
|
|||||||
run: python3 cue-test.py
|
run: python3 cue-test.py
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
name: B-${{ matrix.base }} ${{ matrix.cmp }} ${{ matrix.configuration }} @ ${{ matrix.os }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
CMP: ${{ matrix.cmp }}
|
CMP: ${{ matrix.cmp }}
|
||||||
BCFG: ${{ matrix.configuration }}
|
BCFG: ${{ matrix.configuration }}
|
||||||
|
BASE: ${{ matrix.base }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-24.04, ubuntu-22.04]
|
os: [ubuntu-24.04, ubuntu-22.04]
|
||||||
cmp: [gcc, clang]
|
cmp: [gcc, clang]
|
||||||
configuration: [default, static, debug, static-debug]
|
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:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Prepare and compile dependencies
|
- name: Prepare and compile dependencies
|
||||||
@@ -51,17 +77,32 @@ jobs:
|
|||||||
run: python cue.py test-results
|
run: python cue.py test-results
|
||||||
|
|
||||||
build-macos:
|
build-macos:
|
||||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
name: B-${{ matrix.base }} ${{ matrix.cmp }} ${{ matrix.configuration }} @ ${{ matrix.os }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
CMP: ${{ matrix.cmp }}
|
CMP: ${{ matrix.cmp }}
|
||||||
BCFG: ${{ matrix.configuration }}
|
BCFG: ${{ matrix.configuration }}
|
||||||
|
BASE: ${{ matrix.base }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [macos-15, macos-14]
|
os: [macos-15, macos-14]
|
||||||
cmp: [clang]
|
cmp: [clang]
|
||||||
configuration: [default, debug]
|
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:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Prepare and compile dependencies
|
- name: Prepare and compile dependencies
|
||||||
@@ -74,18 +115,31 @@ jobs:
|
|||||||
run: python cue.py test-results
|
run: python cue.py test-results
|
||||||
|
|
||||||
build-windows:
|
build-windows:
|
||||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
name: B-${{ matrix.base }} ${{ matrix.cmp }} ${{ matrix.configuration }} @ ${{ matrix.os }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
CMP: ${{ matrix.cmp }}
|
CMP: ${{ matrix.cmp }}
|
||||||
BCFG: ${{ matrix.configuration }}
|
BCFG: ${{ matrix.configuration }}
|
||||||
|
BASE: ${{ matrix.base }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-2025, windows-2022]
|
os: [windows-2025, windows-2022]
|
||||||
cmp: [gcc, vs2022]
|
cmp: [gcc, vs2022]
|
||||||
configuration: [default, static, debug, static-debug]
|
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:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Prepare and compile dependencies
|
- name: Prepare and compile dependencies
|
||||||
|
|||||||
7
cue.py
7
cue.py
@@ -618,6 +618,13 @@ def add_dependency(dep):
|
|||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'add-msi-to-314.patch')],
|
sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'add-msi-to-314.patch')],
|
||||||
cwd=place)
|
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:
|
else:
|
||||||
# force including RELEASE.local for non-base modules by overwriting their configure/RELEASE
|
# force including RELEASE.local for non-base modules by overwriting their configure/RELEASE
|
||||||
release = os.path.join(place, "configure", "RELEASE")
|
release = os.path.join(place, "configure", "RELEASE")
|
||||||
|
|||||||
24
dont_use_readline_314.patch
Normal file
24
dont_use_readline_314.patch
Normal 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
|
||||||
Reference in New Issue
Block a user