Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitHub Actions setup fixes #496

Merged
merged 5 commits into from
Oct 2, 2023
Merged

GitHub Actions setup fixes #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40efcc4
ci: update ci-scripts to master (e0a7c531)
ralphlange Oct 2, 2023
97b6e25
ci: use ASYN_HOOK to set TIRPC=YES on Linux
ralphlange Oct 2, 2023
9a3890f
ci: update GHA to use checkout@v3
ralphlange Oct 2, 2023
98e194c
ci: clean up settings in .ci-local
ralphlange Oct 2, 2023
d9c298c
ci: add ubuntu-20.04 job
ralphlange Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci
Open in desktop
Submodule .ci updated 6 files
+13 −9 .github/workflows/build-and-test.yml
+13 −0 README.md
+1 −1 cue-test.py
+21 −3 cue.py
+1 −1 defaults.set
+2 −2 github-actions/ci-scripts-build.yml.example-full
22 changes: 2 additions & 20 deletions .ci-local/adsupport.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +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
ADD_MODULES=ADSUPPORT

ADSUPPORT_REPOOWNER=areaDetector
ADSUPPORT_HOOK=.ci-local/adsupport-config.py
9 changes: 9 additions & 0 deletions .ci-local/asyn-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Empty file removed .ci-local/defaults.set
View file
Open in desktop
Empty file.
19 changes: 4 additions & 15 deletions .ci-local/os.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +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
17 changes: 11 additions & 6 deletions .github/workflows/ci-scripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
SETUP_PATH: .ci-local
SETUP_PATH: .ci-local:.ci

jobs:
test:
Expand Down Expand Up @@ -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
Expand All @@ -70,13 +76,12 @@ jobs:
base: "7.0"
deps: adsupport
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
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 \
Expand Down Expand Up @@ -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: |
Expand Down
Loading