Skip to content

Commit a6f6b9b

Browse files
committed
Update .ci submodule to ci-scripts v3.0.2
1 parent 426c06b commit a6f6b9b

3 files changed

Lines changed: 50 additions & 24 deletions

File tree

.appveyor.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ skip_commits:
3535
- '**/*.md'
3636
- '.travis.yml'
3737

38+
#---------------------------------#
39+
# additional packages #
40+
#---------------------------------#
41+
42+
install:
43+
# fetch submodules (like ci-scripts)
44+
- cmd: git submodule update --init --recursive
45+
3846
#---------------------------------#
3947
# build matrix configuration #
4048
#---------------------------------#
@@ -48,9 +56,9 @@ image: Visual Studio 2019
4856

4957
# Build Configurations: dll/static, regular/debug
5058
configuration:
51-
- dynamic
59+
- default
5260
- static
53-
- dynamic-debug
61+
- debug
5462
- static-debug
5563

5664
# Environment variables: compiler toolchain, base version, setup file, ...
@@ -87,18 +95,16 @@ platform:
8795
# building & testing #
8896
#---------------------------------#
8997

90-
install:
91-
- cmd: git submodule update --init --recursive
92-
- cmd: python .ci/appveyor/do.py prepare
93-
9498
build_script:
95-
- cmd: python .ci/appveyor/do.py build
99+
- cmd: python .ci/cue.py prepare
100+
- cmd: python .ci/cue.py build
96101

97102
test_script:
98-
- cmd: python .ci/appveyor/do.py test
103+
- cmd: python .ci/cue.py test
99104

100105
on_finish:
101106
- ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
107+
- cmd: python .ci/cue.py test-results
102108

103109
#---------------------------------#
104110
# debugging #

.travis.yml

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
global:
1414
- SETUP_PATH=.ci-local:.ci
1515
- EXTRA="CMD_CXXFLAGS=-std=c++11"
16+
- BASE_RECURSIVE=NO
1617

1718
addons:
1819
apt:
@@ -33,24 +34,26 @@ addons:
3334
update: true
3435

3536
install:
36-
- ./.ci/travis/prepare.sh
37+
- python .ci/cue.py prepare
3738

3839
script:
39-
- ./.ci/travis/build.sh
40+
- python .ci/cue.py build
41+
- python .ci/cue.py test
42+
- python .ci/cue.py test-results
4043

41-
# If you need to do more during install and build,
42-
# add a local directory to your module and do e.g.
43-
# - ./.ci-local/travis/install-extras.sh
4444

4545
# Define build jobs
4646

4747
# Well-known variables to use
4848
# SET source setup file
4949
# ADD_MODULES extra modules (for a specific job)
50-
# EXTRA content will be added to make command line
51-
# STATIC set to YES for static build (default: NO)
50+
# BCFG build configuration (static/debug/static-debug;
51+
# default: shared-optimized)
5252
# TEST set to NO to skip running the tests (default: YES)
5353
# VV set to make build scripts verbose (default: unset)
54+
# EXTRA content will be added to make command line
55+
# EXTRA1..5 more additional arguments for the make command
56+
# (one argument per variable)
5457

5558
# Usually from setup files, but may be specified or overridden
5659
# on a job line
@@ -64,31 +67,31 @@ jobs:
6467

6568
# Different configurations of default gcc and clang
6669

67-
- env: BASE=7.0 BASE_RECURSIVE=NO
70+
- env: BASE=7.0
6871

69-
- env: BASE=7.0 BASE_RECURSIVE=NO
72+
- env: BASE=7.0
7073
compiler: clang
7174

72-
- env: BASE=7.0 STATIC=YES BASE_RECURSIVE=NO
75+
- env: BASE=7.0 BCFG=static
7376

7477
- env: BASE=3.15
7578

76-
- env: BASE=3.15 STATIC=YES
79+
- env: BASE=3.15 BCFG=static
7780

7881
- env: BASE=R3.15.3
7982

80-
- env: BASE=R3.15.3 STATIC=YES
83+
- env: BASE=R3.15.3 BCFG=static
8184

8285
- env: BASE=R3.14.12.8
8386

84-
- env: BASE=R3.14.12.8 STATIC=YES
87+
- env: BASE=R3.14.12.8 BCFG=static
8588

8689
# Trusty: compiler versions very close to RHEL 7
8790

88-
- env: BASE=7.0 BASE_RECURSIVE=NO
91+
- env: BASE=7.0
8992
dist: trusty
9093

91-
- env: BASE=7.0 STATIC=YES BASE_RECURSIVE=NO
94+
- env: BASE=7.0 BCFG=static
9295
dist: trusty
9396

9497
# Cross-compilation to RTEMS 4.x doesn't work (g++ 4.4.x is too old)
@@ -100,3 +103,20 @@ jobs:
100103
- env: BASE=3.15
101104
os: osx
102105
compiler: clang
106+
107+
# Windows builds
108+
109+
- env: BASE=7.0
110+
os: windows
111+
compiler: vs2017
112+
113+
- env: BASE=7.0 BCFG=static
114+
os: windows
115+
compiler: vs2017
116+
117+
- env: BASE=R3.15.3
118+
os: windows
119+
compiler: vs2017
120+
121+
- env: BASE=7.0
122+
os: windows

0 commit comments

Comments
 (0)