From 79b02254c4f71f5eebb5d27175e5075816a64da4 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 16 Jun 2020 16:36:55 -0700
Subject: [PATCH] update ci-scripts to 3.0.1

---
 .appveyor.yml | 20 ++++++--------------
 .ci           |  2 +-
 .travis.yml   | 44 +++++++++++++++-----------------------------
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 527781b..0f6b9d7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,8 +1,6 @@
 # .appveyor.yml for use with EPICS Base ci-scripts
 # (see: https://github.com/epics-base/ci-scripts)
 
-# This is YAML - indentation levels are crucial
-
 cache:
   - C:\Users\appveyor\.tools
 
@@ -41,14 +39,14 @@ configuration:
 # Environment variables: compiler toolchain, base version, setup file, ...
 environment:
   # common / default variables for all jobs
-  SETUP_PATH: .ci-local:.ci
+  SETUP_PATH: .ci-local
 
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     CMP: vs2019
     BASE: 7.0
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    CMP: mingw
+    CMP: gcc
     BASE: 7.0
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     CMP: vs2017
@@ -66,15 +64,15 @@ platform:
 #---------------------------------#
 
 build_script:
-  - cmd: python .ci/appveyor/do.py prepare
-  - 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/appveyor/do.py build test-results -s
+  - cmd: python .ci/cue.py build test-results -s
 
 #---------------------------------#
 #         debugging               #
@@ -93,10 +91,4 @@ on_finish:
 #---------------------------------#
 
 notifications:
-
-  - provider: Email
-    to:
-      - me@example.com
-    on_build_success: false
-
   - provider: GitHubPullRequest
diff --git a/.ci b/.ci
index ecb7e43..12d7698 160000
--- a/.ci
+++ b/.ci
@@ -1 +1 @@
-Subproject commit ecb7e43660200bd5d69e4ffa2a402046cd46e36b
+Subproject commit 12d769835e1ee88e94b5b0b4bc0cf7068e678064
diff --git a/.travis.yml b/.travis.yml
index 973e593..e77cc6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 # .travis.yml for use with EPICS Base ci-scripts
 # (see: https://github.com/epics-base/ci-scripts)
 
-# This is YAML - indentation levels are crucial
-
 language: cpp
 compiler: gcc
 dist: bionic
@@ -13,7 +11,7 @@ cache:
 
 env:
   global:
-    - SETUP_PATH=.ci-local:.ci
+    - SETUP_PATH=.ci-local
 
 addons:
   apt:
@@ -31,34 +29,24 @@ addons:
     - qemu-system-x86
 
 install:
-  - ./.ci/travis/prepare.sh
+  - python .ci/cue.py prepare
 
 script:
-  - ./.ci/travis/build.sh
-
-# 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
-# EXTRA    content will be added to make command line
-# STATIC   set to YES for static build (default: NO)
-# TEST     set to NO to skip running the tests (default: YES)
-# VV       set to make build scripts verbose (default: unset)
-
-# Usually from setup files, but may be specified or overridden
-#  on a job line
-# MODULES  list of dependency modules
-# BASE     branch or release tag name of the EPICS Base to use
-# <MODULE> branch or release tag for a specific module
-# ...      see README for setup file syntax description
+  - python .ci/cue.py build
+  - python .ci/cue.py test-results
 
 jobs:
   include:
 
+# Windows builds
+
+  - env: BASE=7.0
+    os: windows
+    compiler: vs2017
+
+  - env: BASE=7.0
+    os: windows
+
 # Different configurations of default gcc and clang
 
   - env: BASE=7.0
@@ -84,11 +72,9 @@ jobs:
 
 # Cross-compilations to Windows using MinGW and WINE
     
-  - env: BASE=7.0 WINE=32 TEST=NO STATIC=YES
-    compiler: mingw
+  - env: BASE=7.0 WINE=32 TEST=NO BCFG=static
 
-  - env: BASE=7.0 WINE=64 TEST=NO STATIC=NO
-    compiler: mingw
+  - env: BASE=7.0 WINE=64 TEST=NO
 
 # Other gcc versions (added as an extra package)