From 40efcc4f647e85916d255ab7c75369dc8127cf91 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 2 Oct 2023 12:33:15 +0200 Subject: [PATCH 1/5] ci: update ci-scripts to master (e0a7c531) --- .ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci b/.ci index aea790683..e0a7c5216 160000 --- a/.ci +++ b/.ci @@ -1 +1 @@ -Subproject commit aea79068391fe407fcb817c036bc54f26342bdaa +Subproject commit e0a7c52160dd22d76ce0aa290f08a2fa200a52a1 From 97b6e2568613097c8c22f5b70ded064d73adca23 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 2 Oct 2023 14:13:43 +0200 Subject: [PATCH 2/5] ci: use ASYN_HOOK to set TIRPC=YES on Linux --- .ci-local/adsupport.set | 1 + .ci-local/asyn-config.sh | 9 +++++++++ .ci-local/os.set | 1 + 3 files changed, 11 insertions(+) create mode 100755 .ci-local/asyn-config.sh diff --git a/.ci-local/adsupport.set b/.ci-local/adsupport.set index 9f363f616..4bf8139f9 100644 --- a/.ci-local/adsupport.set +++ b/.ci-local/adsupport.set @@ -19,6 +19,7 @@ PVDATABASE_REPONAME=pvDatabaseCPP PVDATABASE_REPOOWNER=epics-base ASYN_REPOOWNER=epics-modules +ASYN_HOOK=.ci-local/asyn-config.sh ADSUPPORT_REPOOWNER=areaDetector ADSUPPORT_HOOK=.ci-local/adsupport-config.py diff --git a/.ci-local/asyn-config.sh b/.ci-local/asyn-config.sh new file mode 100755 index 000000000..c767bd91e --- /dev/null +++ b/.ci-local/asyn-config.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e -x + +[ -d "asyn/asynDriver" ] || exit 1 + +[ -f "/usr/include/rpc/rpc.h" ] && exit 0 + +[ -f "/usr/include/tirpc/rpc/rpc.h" ] && \ + echo "TIRPC=YES" >> "configure/CONFIG_SITE.Common.linux-x86_64" diff --git a/.ci-local/os.set b/.ci-local/os.set index c6e329346..ed64790d4 100644 --- a/.ci-local/os.set +++ b/.ci-local/os.set @@ -19,3 +19,4 @@ PVDATABASE_REPONAME=pvDatabaseCPP PVDATABASE_REPOOWNER=epics-base ASYN_REPOOWNER=epics-modules +ASYN_HOOK=.ci-local/asyn-config.sh From 9a3890f9932412b4f6f3132d884698909be3288f Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 2 Oct 2023 12:47:23 +0200 Subject: [PATCH 3/5] ci: update GHA to use checkout@v3 --- .github/workflows/ci-scripts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index 691d2a9e8..1135a4416 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -70,7 +70,7 @@ jobs: base: "7.0" deps: adsupport steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true From 98e194cf84099bcb8c3989dea4778f74fbaf5add Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 2 Oct 2023 14:27:39 +0200 Subject: [PATCH 4/5] ci: clean up settings in .ci-local --- .ci-local/adsupport.set | 23 ++--------------------- .ci-local/defaults.set | 0 .ci-local/os.set | 18 +++--------------- .github/workflows/ci-scripts.yml | 2 +- 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 .ci-local/defaults.set diff --git a/.ci-local/adsupport.set b/.ci-local/adsupport.set index 4bf8139f9..d660662a4 100644 --- a/.ci-local/adsupport.set +++ b/.ci-local/adsupport.set @@ -1,25 +1,6 @@ -MODULES=PVDATA PVACCESS NT PVDATABASE asyn ADSupport +include os -BASE_DIRNAME=base -BASE_REPONAME=epics-base -BASE_REPOOWNER=epics-base -BASE_VARNAME=EPICS_BASE -BASE_RECURSIVE=no - -PVDATA_REPONAME=pvDataCPP -PVDATA_REPOOWNER=epics-base - -PVACCESS_REPONAME=pvAccessCPP -PVACCESS_REPOOWNER=epics-base - -NT_REPONAME=normativeTypesCPP -NT_REPOOWNER=epics-base - -PVDATABASE_REPONAME=pvDatabaseCPP -PVDATABASE_REPOOWNER=epics-base - -ASYN_REPOOWNER=epics-modules -ASYN_HOOK=.ci-local/asyn-config.sh +ADD_MODULES=ADSUPPORT ADSUPPORT_REPOOWNER=areaDetector ADSUPPORT_HOOK=.ci-local/adsupport-config.py diff --git a/.ci-local/defaults.set b/.ci-local/defaults.set deleted file mode 100644 index e69de29bb..000000000 diff --git a/.ci-local/os.set b/.ci-local/os.set index ed64790d4..b3373ab51 100644 --- a/.ci-local/os.set +++ b/.ci-local/os.set @@ -1,22 +1,10 @@ -MODULES=PVDATA PVACCESS NT PVDATABASE asyn +include defaults -BASE_DIRNAME=base -BASE_REPONAME=epics-base -BASE_REPOOWNER=epics-base -BASE_VARNAME=EPICS_BASE -BASE_RECURSIVE=no - -PVDATA_REPONAME=pvDataCPP -PVDATA_REPOOWNER=epics-base +MODULES=PVDATA PVACCESS NTYPES PVDATABASE ASYN -PVACCESS_REPONAME=pvAccessCPP -PVACCESS_REPOOWNER=epics-base - -NT_REPONAME=normativeTypesCPP -NT_REPOOWNER=epics-base +BASE_RECURSIVE=no PVDATABASE_REPONAME=pvDatabaseCPP PVDATABASE_REPOOWNER=epics-base -ASYN_REPOOWNER=epics-modules ASYN_HOOK=.ci-local/asyn-config.sh diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index 1135a4416..3417f5eb3 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -9,7 +9,7 @@ on: pull_request: env: - SETUP_PATH: .ci-local + SETUP_PATH: .ci-local:.ci jobs: test: From d9c298c2363e947c5d521b8d1399447640e22a31 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 2 Oct 2023 17:53:15 +0200 Subject: [PATCH 5/5] ci: add ubuntu-20.04 job --- .github/workflows/ci-scripts.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index 3417f5eb3..156ffe38e 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -46,6 +46,12 @@ jobs: base: "7.0" deps: adsupport + - os: ubuntu-20.04 + cmp: gcc + configuration: default + base: "7.0" + deps: os + - os: ubuntu-latest cmp: gcc configuration: default @@ -74,9 +80,8 @@ jobs: with: submodules: true - - name: "Linux OS Deps" - if: ${{ matrix.deps == 'os' && matrix.os == 'ubuntu-latest' }} - shell: bash + - name: "Install Linux OS Deps" + if: ${{ matrix.deps == 'os' && runner.os == 'Linux' }} run: | sudo apt-get update sudo apt-get -y install \ @@ -126,7 +131,7 @@ jobs: - name: Prepare and compile EPICS dependencies run: python .ci/cue.py prepare - - name: "ADSupport Deps" + - name: "Configure ADSupport Deps" if: ${{ matrix.deps == 'adsupport' }} shell: bash run: |