2 Commits

Author SHA1 Message Date
Andrew Johnson
48e6c9f5ef GHA config updates 2025-04-06 12:52:27 +01:00
Andrew Johnson
073d2acafc Set next development version 2025-02-21 15:40:21 -06:00
3 changed files with 35 additions and 26 deletions

View File

@@ -12,11 +12,13 @@ on:
push: push:
paths-ignore: paths-ignore:
- 'documentation/*' - 'documentation/*'
- '.*.yml' - '.appveyor.yml'
- '.readthedocs.yml'
pull_request: pull_request:
paths-ignore: paths-ignore:
- 'documentation/*' - 'documentation/*'
- '.*.yml' - '.appveyor.yml'
- '.readthedocs.yml'
env: env:
SETUP_PATH: .ci-local:.ci SETUP_PATH: .ci-local:.ci
@@ -39,67 +41,74 @@ jobs:
matrix: matrix:
# Job names also name artifacts, character limitations apply # Job names also name artifacts, character limitations apply
include: include:
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: default configuration: default
base: "7.0" base: "7.0"
cross: "windows-x64-mingw" cross: "windows-x64-mingw"
name: "7.0 Ub-20 gcc-9 + MinGW" name: "7.0 Ub-22 gcc + MinGW"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: static configuration: static
base: "7.0" base: "7.0"
cross: "windows-x64-mingw" cross: "windows-x64-mingw"
name: "7.0 Ub-20 gcc-9 + MinGW, static" name: "7.0 Ub-22 gcc + MinGW, static"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: static configuration: static
base: "7.0" base: "7.0"
extra: "CMD_CXXFLAGS=-std=c++11" extra: "CMD_CXXFLAGS=-std=c++11"
name: "7.0 Ub-20 gcc-9 C++11, static" name: "7.0 Ub-22 gcc C++11, static"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc
configuration: static
base: "7.0"
extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
name: "7.0 Ub-22 gcc uchar"
- os: ubuntu-22.04
cmp: clang cmp: clang
configuration: default configuration: default
base: "7.0" base: "7.0"
name: "7.0 Ub-20 clang-10" name: "7.0 Ub-22 clang"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: clang cmp: clang
configuration: default configuration: default
base: "7.0" base: "7.0"
extra: "CMD_CXXFLAGS=-std=c++11" extra: "CMD_CXXFLAGS=-std=c++11"
name: "7.0 Ub-20 clang-10 C++11" name: "7.0 Ub-22 clang C++11"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: default configuration: default
base: "7.0" base: "7.0"
cross: "RTEMS-pc686-qemu@5" cross: "RTEMS-pc686-qemu@5"
name: "7.0 Ub-20 gcc-9 + RT-5.1 pc686" name: "7.0 Ub-22 gcc + RT-5.1 pc686"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: default configuration: default
base: "7.0" base: "7.0"
cross: "RTEMS-pc386-qemu@4.10" cross: "RTEMS-pc386-qemu@4.10"
test: NO test: NO
name: "7.0 Ub-20 gcc-9 + RT-4.10" name: "7.0 Ub-22 gcc + RT-4.10"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: default configuration: default
base: "7.0" base: "7.0"
cross: "RTEMS-pc386-qemu@4.9" cross: "RTEMS-pc386-qemu@4.9"
name: "7.0 Ub-20 gcc-9 + RT-4.9" name: "7.0 Ub-22 gcc + RT-4.9"
- os: macos-latest - os: macos-latest
cmp: clang cmp: clang
configuration: default configuration: default
base: "7.0" base: "7.0"
name: "7.0 MacOS clang-12" name: "7.0 MacOS clang"
- os: windows-2019 - os: windows-2019
cmp: vs2019 cmp: vs2019
@@ -127,15 +136,15 @@ jobs:
base: "7.0" base: "7.0"
name: "7.0 Win2019 mingw" name: "7.0 Win2019 mingw"
- os: ubuntu-20.04 - os: ubuntu-22.04
cmp: gcc cmp: gcc
configuration: default configuration: default
base: "3.15" base: "3.15"
wine: "64" wine: "64"
name: "3.15 Ub-20 gcc-9 + MinGW" name: "3.15 Ub-22 gcc + MinGW"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: true submodules: true
- name: Automatic core dump analysis - name: Automatic core dump analysis
@@ -153,7 +162,7 @@ jobs:
run: python .ci/cue.py -T 20M test run: python .ci/cue.py -T 20M test
- name: Upload tapfiles Artifact - name: Upload tapfiles Artifact
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: tapfiles ${{ matrix.name }} name: tapfiles ${{ matrix.name }}
path: '**/O.*/*.tap' path: '**/O.*/*.tap'

View File

@@ -38,7 +38,7 @@ PROJECT_NAME = pvDatabaseCPP
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 4.7.2 PROJECT_NUMBER = 4.7.3-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

View File

@@ -2,11 +2,11 @@
EPICS_PVDATABASE_MAJOR_VERSION = 4 EPICS_PVDATABASE_MAJOR_VERSION = 4
EPICS_PVDATABASE_MINOR_VERSION = 7 EPICS_PVDATABASE_MINOR_VERSION = 7
EPICS_PVDATABASE_MAINTENANCE_VERSION = 2 EPICS_PVDATABASE_MAINTENANCE_VERSION = 3
# Development flag, set to zero for release versions # Development flag, set to zero for release versions
EPICS_PVDATABASE_DEVELOPMENT_FLAG = 0 EPICS_PVDATABASE_DEVELOPMENT_FLAG = 1
# Immediately after a release the MAINTENANCE_VERSION # Immediately after a release the MAINTENANCE_VERSION
# will be incremented and the DEVELOPMENT_FLAG set to 1 # will be incremented and the DEVELOPMENT_FLAG set to 1