Skip to content

Commit

Permalink
Update .ci submodule to ci-scripts v3.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ralphlange committed Jun 23, 2020
1 parent 426c06b commit a6f6b9b
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 24 deletions.
22 changes: 14 additions & 8 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ skip_commits:
- '**/*.md'
- '.travis.yml'

#---------------------------------#
# additional packages #
#---------------------------------#

install:
# fetch submodules (like ci-scripts)
- cmd: git submodule update --init --recursive

#---------------------------------#
# build matrix configuration #
#---------------------------------#
Expand All @@ -48,9 +56,9 @@ image: Visual Studio 2019

# Build Configurations: dll/static, regular/debug
configuration:
- dynamic
- default
- static
- dynamic-debug
- debug
- static-debug

# Environment variables: compiler toolchain, base version, setup file, ...
Expand Down Expand Up @@ -87,18 +95,16 @@ platform:
# building & testing #
#---------------------------------#

install:
- cmd: git submodule update --init --recursive
- cmd: python .ci/appveyor/do.py prepare

build_script:
- cmd: python .ci/appveyor/do.py build
- cmd: python .ci/cue.py prepare
- cmd: python .ci/cue.py build

test_script:
- cmd: python .ci/appveyor/do.py test
- cmd: python .ci/cue.py test

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

#---------------------------------#
# debugging #
Expand Down
50 changes: 35 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
global:
- SETUP_PATH=.ci-local:.ci
- EXTRA="CMD_CXXFLAGS=-std=c++11"
- BASE_RECURSIVE=NO

addons:
apt:
Expand All @@ -33,24 +34,26 @@ addons:
update: true

install:
- ./.ci/travis/prepare.sh
- python .ci/cue.py prepare

script:
- ./.ci/travis/build.sh
- python .ci/cue.py build
- python .ci/cue.py test
- python .ci/cue.py test-results

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

# Define build jobs

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

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

# Different configurations of default gcc and clang

- env: BASE=7.0 BASE_RECURSIVE=NO
- env: BASE=7.0

- env: BASE=7.0 BASE_RECURSIVE=NO
- env: BASE=7.0
compiler: clang

- env: BASE=7.0 STATIC=YES BASE_RECURSIVE=NO
- env: BASE=7.0 BCFG=static

- env: BASE=3.15

- env: BASE=3.15 STATIC=YES
- env: BASE=3.15 BCFG=static

- env: BASE=R3.15.3

- env: BASE=R3.15.3 STATIC=YES
- env: BASE=R3.15.3 BCFG=static

- env: BASE=R3.14.12.8

- env: BASE=R3.14.12.8 STATIC=YES
- env: BASE=R3.14.12.8 BCFG=static

# Trusty: compiler versions very close to RHEL 7

- env: BASE=7.0 BASE_RECURSIVE=NO
- env: BASE=7.0
dist: trusty

- env: BASE=7.0 STATIC=YES BASE_RECURSIVE=NO
- env: BASE=7.0 BCFG=static
dist: trusty

# Cross-compilation to RTEMS 4.x doesn't work (g++ 4.4.x is too old)
Expand All @@ -100,3 +103,20 @@ jobs:
- env: BASE=3.15
os: osx
compiler: clang

# Windows builds

- env: BASE=7.0
os: windows
compiler: vs2017

- env: BASE=7.0 BCFG=static
os: windows
compiler: vs2017

- env: BASE=R3.15.3
os: windows
compiler: vs2017

- env: BASE=7.0
os: windows

0 comments on commit a6f6b9b

Please sign in to comment.