Skip to content

Commit

Permalink
Update Appveyor and GHA CI build configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
anjohnson committed Aug 10, 2024
1 parent 19475e9 commit c8598ed
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 42 deletions.
29 changes: 13 additions & 16 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@

# This is YAML - indentation levels are crucial

cache:
- C:\Users\appveyor\.tools

#---------------------------------#
# additional packages #
# build cache #
#---------------------------------#
# The AppVeyor cache allowance is way too small (1GB per account across all
# projects, branches and jobs) to be used for the dependency builds.

install:
# for the sequencer
- cinst re2c
- cmd: git submodule update --init --recursive
cache:
- C:\Users\appveyor\.tools

#---------------------------------#
# repository cloning #
Expand All @@ -23,14 +20,11 @@ init:
# Set autocrlf to make batch files work
- git config --global core.autocrlf true

clone_depth: 50
clone_depth: 5

# Skipping commits affecting only specific files
skip_commits:
files:
- 'documentation/*'
- '**/*.md'
- '.github/**'
#---------------------------------#
# build matrix configuration #
#---------------------------------#

# Build Configurations: dll/static, regular/debug
configuration:
Expand All @@ -43,6 +37,7 @@ configuration:
environment:
# common / default variables for all jobs
SETUP_PATH: .ci-local:.ci
EPICS_TEST_IMPRECISE_TIMING: YES

matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
Expand All @@ -66,8 +61,10 @@ platform:
# building & testing #
#---------------------------------#

build_script:
install:
- cmd: python .ci/cue.py prepare

build_script:
- cmd: python .ci/cue.py build

test_script:
Expand Down
54 changes: 28 additions & 26 deletions .github/workflows/ci-scripts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ jobs:
BASE: ${{ matrix.base }}
CMP: ${{ matrix.cmp }}
BCFG: ${{ matrix.configuration }}
WINE: ${{ matrix.wine }}
RTEMS: ${{ matrix.rtems }}
CI_CROSS_TARGETS: ${{ matrix.cross }}
EXTRA: ${{ matrix.extra }}
TEST: ${{ matrix.test }}
strategy:
Expand All @@ -40,21 +39,21 @@ jobs:
cmp: gcc
configuration: default
base: "7.0"
wine: "64"
cross: "windows-x64-mingw"
name: "7.0 Ub-20 gcc-9 + MinGW"

- os: ubuntu-20.04
cmp: gcc
configuration: static
base: "7.0"
wine: "64"
cross: "windows-x64-mingw"
name: "7.0 Ub-20 gcc-9 + MinGW, static"

- os: ubuntu-20.04
cmp: gcc
configuration: default
base: "3.15"
wine: "64"
cross: "windows-x64-mingw"
name: "3.15 Ub-20 gcc-9 + MinGW"

- os: ubuntu-20.04
Expand All @@ -64,6 +63,12 @@ jobs:
extra: "CMD_CXXFLAGS=-std=c++11"
name: "7.0 Ub-20 gcc-9 C++11, static"

- os: ubuntu-20.04
cmp: clang
configuration: default
base: "7.0"
name: "7.0 Ub-20 clang-10"

- os: ubuntu-20.04
cmp: clang
configuration: default
Expand All @@ -75,22 +80,16 @@ jobs:
cmp: gcc
configuration: default
base: "7.0"
rtems: "4.10"
cross: "RTEMS-pc386-qemu@4.10"
name: "7.0 Ub-20 gcc-9 + RT-4.10"

- os: ubuntu-20.04
cmp: gcc
configuration: default
base: "7.0"
rtems: "4.9"
cross: "RTEMS-pc386-qemu@4.9"
name: "7.0 Ub-20 gcc-9 + RT-4.9"

- os: ubuntu-20.04
cmp: clang
configuration: default
base: "7.0"
name: "7.0 Ub-20 clang-10"

- os: macos-latest
cmp: clang
configuration: default
Expand All @@ -113,10 +112,10 @@ jobs:
cmp: gcc
configuration: static
base: "7.0"
name: "7.0 Win2019 mingw, static"
name: "7.0 Win2019 MinGW, static"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: "apt-get install"
Expand All @@ -131,11 +130,14 @@ jobs:
- name: Run main module tests
run: python .ci/cue.py test
- name: Upload tapfiles Artifact
uses: actions/upload-artifact@v2
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
name: tapfiles ${{ matrix.name }}
path: '**/O.*/*.tap'
if-no-files-found: ignore
- name: Collect and show test results
if: ${{ always() }}
run: python .ci/cue.py test-results

docker:
Expand All @@ -148,22 +150,20 @@ jobs:
BASE: ${{ matrix.base }}
CMP: ${{ matrix.cmp }}
BCFG: ${{ matrix.configuration }}
WINE: ${{ matrix.wine }}
RTEMS: ${{ matrix.rtems }}
EXTRA: ${{ matrix.extra }}
TEST: ${{ matrix.test }}
strategy:
fail-fast: false
matrix:
# Job names also name artifacts, character limitations apply
include:
- name: Linux centos 7
image: centos:7
cmp: gcc
configuration: default
base: "7.0"
#- name: "CentOS-7"
# image: centos:7
# cmp: gcc
# configuration: default
# base: "7.0"

- name: Linux fedora latest
- name: Fedora-latest
image: fedora:latest
cmp: gcc
configuration: default
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
# people would rather just break all existing scripts...
[ -e /usr/bin/python ] || ln -sf /usr/bin/python3 /usr/bin/python
python --version
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Prepare and compile dependencies
Expand All @@ -206,9 +206,11 @@ jobs:
- name: Run main module tests
run: python .ci/cue.py test
- name: Upload tapfiles Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: tapfiles ${{ matrix.name }}
path: '**/O.*/*.tap'
if-no-files-found: ignore
- name: Collect and show test results
if: ${{ always() }}
run: python .ci/cue.py test-results

0 comments on commit c8598ed

Please sign in to comment.