From 32ff3b2ed99bc27b9f5f876f2a9a48a29c40f2fe Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 22 Jun 2020 12:31:45 -0700
Subject: [PATCH] update ci-scripts 3.0

---
 .appveyor.yml | 12 +++++++-----
 .ci           |  2 +-
 .travis.yml   | 16 ++++++++--------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 594e89887..eba6f4aaa 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,6 +37,8 @@ skip_commits:
 #   build matrix configuration    #
 #---------------------------------#
 
+image: Visual Studio 2015
+
 # Build Configurations: dll/static, regular/debug
 configuration:
   - dynamic
@@ -60,7 +62,7 @@ environment:
   - CMP: vs2013
   - CMP: vs2012
   - CMP: vs2010
-  - CMP: mingw
+  - CMP: gcc
 
 # Platform: processor architecture
 platform:
@@ -90,17 +92,17 @@ matrix:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: python .ci/appveyor/do.py prepare
+  - cmd: python .ci/cue.py prepare
 
 build_script:
-  - cmd: python .ci/appveyor/do.py build
+  - 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/appveyor/do.py build test-results -s
+  - cmd: python .ci/cue.py build test-results -s
 
 #---------------------------------#
 #         debugging               #
diff --git a/.ci b/.ci
index 55038b731..b3091e6d6 160000
--- a/.ci
+++ b/.ci
@@ -1 +1 @@
-Subproject commit 55038b731516f22584b7e1cede4ef0a05b8b647e
+Subproject commit b3091e6d6f75838ad370395d7265fb303850a202
diff --git a/.travis.yml b/.travis.yml
index 062bf4b8c..c4ee7adf3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,10 +37,12 @@ addons:
 
 install:
   - ./.ci-local/travis-fixup.sh
-  - ./.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
 
 # Define build jobs
 
@@ -53,7 +55,7 @@ jobs:
   - dist: xenial
 
   - dist: bionic
-    env: STATIC=YES EXTRA="CMD_CXXFLAGS=-std=c++11"
+    env: BCFG=static EXTRA="CMD_CXXFLAGS=-std=c++11"
 
   - dist: trusty
     env: EXTRA="CMD_CXXFLAGS=-std=c++11"
@@ -65,15 +67,13 @@ jobs:
 
   - dist: trusty
     compiler: clang
-    env: STATIC=YES
+    env: BCFG=static
 
 # Cross-compilations to Windows using MinGW and WINE
 
-  - env: WINE=32 TEST=NO STATIC=YES
-    compiler: mingw
+  - env: WINE=32 TEST=NO BCFG=static
 
-  - env: WINE=32 TEST=NO STATIC=NO
-    compiler: mingw
+  - env: WINE=32 TEST=NO
 
 # Cross-compilation to RTEMS