Compare commits
40 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87942a7c29 | ||
|
|
0bf7d23a6f | ||
|
|
b592ab053c | ||
|
|
e10326b129 | ||
|
|
bd7612dcab | ||
|
|
1b066feacc | ||
|
|
ee362d84aa | ||
|
|
9942f81988 | ||
|
|
ce99ab4e52 | ||
|
|
08d2f23295 | ||
|
|
a439d7aa64 | ||
|
|
6eefee8d18 | ||
|
|
c7a134e1fb | ||
|
|
ba5173a494 | ||
|
|
b568ca982b | ||
|
|
04f99fe6c4 | ||
|
|
0b54ff61c4 | ||
|
|
074a7ab617 | ||
|
|
5a0acc2228 | ||
|
|
1c0f786eeb | ||
|
|
4b76e0623d | ||
|
|
e8508cb658 | ||
|
|
388cc57533 | ||
|
|
5beeada73f | ||
|
|
348a7dc851 | ||
|
|
ab52808c63 | ||
|
|
3a99f3c9d6 | ||
|
|
6c645363b3 | ||
|
|
2dbd777852 | ||
|
|
576b5a4caf | ||
|
|
031a756941 | ||
|
|
f324cd3bdd | ||
|
|
0ba02c5b03 | ||
|
|
b0c910c1cc | ||
|
|
59304f83c2 | ||
|
|
b3091e6d6f | ||
|
|
1a996e5407 | ||
|
|
f927e475ff | ||
|
|
fbd6bac81a | ||
|
|
12d769835e |
@@ -37,6 +37,7 @@ skip_commits:
|
||||
- '**/*.html'
|
||||
- '**/*.md'
|
||||
- '.travis.yml'
|
||||
- '.github/workflows/*'
|
||||
|
||||
#---------------------------------#
|
||||
# additional packages #
|
||||
@@ -80,6 +81,7 @@ environment:
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||
- CMP: vs2019
|
||||
BASE: 3.15
|
||||
CLEAN_DEPS: NO
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||
- CMP: vs2019
|
||||
BASE: 3.14
|
||||
|
||||
154
.github/workflows/build-and-test.yml
vendored
Normal file
154
.github/workflows/build-and-test.yml
vendored
Normal file
@@ -0,0 +1,154 @@
|
||||
name: ci-scripts build/test
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
env:
|
||||
SETUP_PATH: .:.ci
|
||||
SET: test01
|
||||
VV: 1
|
||||
BASE_RECURSIVE: NO
|
||||
CMP: gcc
|
||||
APT: re2c
|
||||
CHOCO: re2c
|
||||
BREW: re2c
|
||||
|
||||
jobs:
|
||||
unit-test:
|
||||
name: Unit tests on ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Show initial environment
|
||||
run: python cue-test.py env
|
||||
- name: Run unit tests
|
||||
run: python cue-test.py
|
||||
|
||||
build-linux:
|
||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
|
||||
cmp: [gcc, clang]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Prepare and compile dependencies
|
||||
run: python cue.py prepare
|
||||
- name: Build main module (example app)
|
||||
run: python cue.py build
|
||||
- name: Run main module tests
|
||||
run: python cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python cue.py test-results
|
||||
|
||||
build-macos:
|
||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [macos-10.15]
|
||||
cmp: [clang]
|
||||
configuration: [default, debug]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Prepare and compile dependencies
|
||||
run: python cue.py prepare
|
||||
- name: Build main module (example app)
|
||||
run: python cue.py build
|
||||
- name: Run main module tests
|
||||
run: python cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python cue.py test-results
|
||||
|
||||
build-windows:
|
||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [windows-2019, windows-2016]
|
||||
cmp: [gcc, vs2019, vs2017]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
exclude:
|
||||
- os: windows-2019
|
||||
cmp: vs2017
|
||||
- os: windows-2016
|
||||
cmp: vs2019
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Prepare and compile dependencies
|
||||
run: python cue.py prepare
|
||||
- name: Build main module (example app)
|
||||
run: python cue.py build
|
||||
- name: Run main module tests
|
||||
run: python cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python cue.py test-results
|
||||
|
||||
build-rtems:
|
||||
name: RTEMS${{ matrix.rtems }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
RTEMS: ${{ matrix.rtems }}
|
||||
APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-18.04]
|
||||
cmp: [gcc]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
rtems: ["4.9", "4.10"]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Prepare and compile dependencies
|
||||
run: python cue.py prepare
|
||||
- name: Build main module (example app)
|
||||
run: python cue.py build
|
||||
- name: Run main module tests
|
||||
run: python cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python cue.py test-results
|
||||
|
||||
build-wine:
|
||||
name: WINE${{ matrix.wine }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
WINE: ${{ matrix.wine }}
|
||||
APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-18.04]
|
||||
cmp: [gcc]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
wine: [32, 64]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Prepare and compile dependencies
|
||||
run: python cue.py prepare
|
||||
- name: Build main module (example app)
|
||||
run: python cue.py build
|
||||
- name: Run main module tests
|
||||
run: python cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python cue.py test-results
|
||||
@@ -30,9 +30,11 @@ addons:
|
||||
- g++-mingw-w64-i686
|
||||
- g++-mingw-w64-x86-64
|
||||
- qemu-system-x86
|
||||
- p7zip-full
|
||||
homebrew:
|
||||
packages:
|
||||
- re2c
|
||||
- p7zip
|
||||
update: true
|
||||
|
||||
install:
|
||||
@@ -98,7 +100,7 @@ jobs:
|
||||
- env: SET=test01 BCFG=static-debug
|
||||
dist: bionic
|
||||
|
||||
- env: SET=test01
|
||||
- env: SET=test01 CLEAN_DEPS=NO
|
||||
dist: trusty
|
||||
|
||||
- env: SET=test01 BCFG=static-debug
|
||||
|
||||
64
README.md
64
README.md
@@ -1,6 +1,7 @@
|
||||
<a target="_blank" href="http://semver.org">![Version][badge.version]</a>
|
||||
<a target="_blank" href="https://travis-ci.org/epics-base/ci-scripts">![Travis status][badge.travis]</a>
|
||||
<a target="_blank" href="https://ci.appveyor.com/project/epics-base/ci-scripts">![AppVeyor status][badge.appveyor]</a>
|
||||
<a target="_blank" href="https://github.com/epics-base/ci-scripts/actions">![GitHub Actions status][badge.gh-actions]</a>
|
||||
|
||||
# Continuous Integration for EPICS Modules
|
||||
|
||||
@@ -58,12 +59,12 @@ levels as the example files.
|
||||
|
||||
### [Travis-CI](https://travis-ci.org/)
|
||||
- Five parallel runners on Linux/Windows (one runner on MacOS)
|
||||
- Use different compilers (gcc, clang)
|
||||
- Use different gcc versions
|
||||
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
|
||||
- Cross-compile for RTEMS 4.9 and 4.10 (Base >= 3.15)
|
||||
- Ubuntu 12/14/16/18, MacOS 10.13, Windows Server v1809
|
||||
- Compile natively on Linux (different versions of gcc, clang)
|
||||
- Compile natively on MacOS (clang)
|
||||
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017)
|
||||
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
|
||||
- Cross-compile for RTEMS 4.9 and 4.10 (Base >= 3.15)
|
||||
- Built dependencies are cached (for faster builds).
|
||||
|
||||
See specific
|
||||
@@ -72,8 +73,8 @@ for more details.
|
||||
|
||||
### [AppVeyor](https://www.appveyor.com/)
|
||||
- One parallel runner (all builds are sequential)
|
||||
- Use different compilers (Visual Studio, gcc/MinGW)
|
||||
- Use different Visual Studio versions: \
|
||||
- Windows Server 2012/2016/2019
|
||||
- Compile using gcc/MinGW or different Visual Studio versions: \
|
||||
2008, 2010, 2012, 2013, 2015, 2017, 2019
|
||||
- Compile for Windows 32bit and 64bit
|
||||
- No useful caching available.
|
||||
@@ -82,15 +83,30 @@ See specific
|
||||
**[ci-scripts on AppVeyor README](appveyor/README.md)**
|
||||
for more details.
|
||||
|
||||
### [GitHub Actions](https://github.com/)
|
||||
- 20 parallel runners on Linux/Windows (5 runners on MacOS)
|
||||
- Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
|
||||
- Compile natively on Linux (gcc, clang)
|
||||
- Compile natively on MacOS (clang)
|
||||
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
|
||||
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
|
||||
- Cross-compile for RTEMS 4.9 and 4.10 (Base >= 3.15)
|
||||
- Caching not supported by ci-scripts yet.
|
||||
|
||||
See specific
|
||||
**[ci-scripts on GitHub Actions README](github-actions/README.md)**
|
||||
for more details.
|
||||
|
||||
## How to Use the CI-Scripts
|
||||
|
||||
1. Get an account on a supported CI service provider platform.
|
||||
1. Get an account on a supported CI service provider platform
|
||||
(e.g. [Travis-CI](https://travis-ci.org/),
|
||||
[AppVeyor](https://www.appveyor.com/), ...)
|
||||
[AppVeyor](https://www.appveyor.com/), ...).
|
||||
GitHub Actions does not require a separate account.
|
||||
|
||||
(More details in the specific README of the subdirectory.)
|
||||
|
||||
2. In your Support Module, add this ci-scripts repository
|
||||
2. In your module, add this ci-scripts repository
|
||||
as a Git Submodule (name suggestion: `.ci`).
|
||||
```bash
|
||||
git submodule add https://github.com/epics-base/ci-scripts .ci
|
||||
@@ -225,10 +241,11 @@ recursing into submodules. [default is including submodules: `YES`]
|
||||
be always be extended by the release or branch name as `<name>-<version>`.
|
||||
[default is the slug in lower case: `foo`]
|
||||
|
||||
`FOO_HOOK=<script>` Set the name of a script that will be run after cloning
|
||||
the module, before compiling it. Working directory when running the script
|
||||
is the root of the targeted module (e.g. `.../.cache/foo-1.2`).
|
||||
[default: no hooks are run]
|
||||
`FOO_HOOK=<hook>` Set the name of a `.patch` file, a `.zip` or `.7z` archive
|
||||
or a script that will be applied (using `-p1`), extracted or run after cloning
|
||||
the module, before compiling it.
|
||||
Working directory is the root of the targeted module,
|
||||
e.g., `.../.cache/foo-1.2`). [default: no hook]
|
||||
|
||||
`FOO_VARNAME=<name>` Set the name that is used for the module when creating
|
||||
the `RELEASE.local` files. [default is the slug in upper case: `FOO`]
|
||||
@@ -251,6 +268,10 @@ location for the dependency builds. [default is `$HOME/.cache`]
|
||||
Set `PARALLEL_MAKE` to the number of parallel make jobs that you want your
|
||||
build to use. [default is the number of CPUs on the runner]
|
||||
|
||||
Set `CLEAN_DEPS` to `NO` if you want to leave the object file directories
|
||||
(`**/O.*`) in the cached dependencies. [default is to run `make clean`
|
||||
after building a dependency]
|
||||
|
||||
Service specific options are described in the README files
|
||||
in the service specific subdirectories:
|
||||
|
||||
@@ -267,6 +288,8 @@ in the service specific subdirectories:
|
||||
|
||||
EPICS Modules:
|
||||
[ASYN](https://github.com/epics-modules/asyn),
|
||||
[autosave](https://github.com/epics-modules/autosave),
|
||||
[busy](https://github.com/epics-modules/busy),
|
||||
[devlib2](https://github.com/epics-modules/devlib2),
|
||||
[ecmc](https://github.com/epics-modules/ecmc),
|
||||
[gtest](https://github.com/epics-modules/gtest),
|
||||
@@ -275,10 +298,14 @@ EPICS Modules:
|
||||
[MCoreUtils](https://github.com/epics-modules/MCoreUtils),
|
||||
[modbus](https://github.com/epics-modules/modbus),
|
||||
[motor](https://github.com/epics-modules/motor),
|
||||
[mrfioc2](https://github.com/epics-modules/mrfioc2),
|
||||
[OPCUA](https://github.com/ralphlange/opcua),
|
||||
[PCAS](https://github.com/epics-modules/pcas),
|
||||
[softGlueZync](https://github.com/epics-modules/softGlueZynq),
|
||||
[sscan](https://github.com/epics-modules/sscan),
|
||||
[vac](https://github.com/epics-modules/vac)
|
||||
[std](https://github.com/epics-modules/std),
|
||||
[vac](https://github.com/epics-modules/vac),
|
||||
[xxx](https://github.com/epics-modules/xxx)
|
||||
|
||||
ESS: [EtherCAT MC Motor Driver][ref.ethercatmc]
|
||||
|
||||
@@ -338,16 +365,16 @@ This will make all builds (not just for your module) verbose.
|
||||
|
||||
Update the submodule in `.ci` first, then change your CI configuration
|
||||
(if needed) and commit both to your module. E.g., to update your Travis
|
||||
setup to release 3.0.1 of ci-scripts:
|
||||
setup to release 3.1.1 of ci-scripts:
|
||||
```bash
|
||||
cd .ci
|
||||
git pull origin v3.0.1
|
||||
git pull origin v3.1.1
|
||||
cd -
|
||||
git add .ci
|
||||
# if needed:
|
||||
edit .travis.yml # and/or .appveyor.yml
|
||||
edit .travis.yml # and/or AppVeyor/GitHub Actions configuration
|
||||
git add .travis.yml
|
||||
git commit -m "Update ci-scripts submodule to v3.0.1"
|
||||
git commit -m "Update ci-scripts submodule to v3.1.1"
|
||||
```
|
||||
|
||||
Check the example configuration files inside ci-scripts (and their
|
||||
@@ -401,6 +428,7 @@ in file LICENSE that is included with this distribution.
|
||||
[badge.version]: https://badge.fury.io/gh/epics-base%2Fci-scripts.svg
|
||||
[badge.travis]: https://travis-ci.org/epics-base/ci-scripts.svg?branch=master
|
||||
[badge.appveyor]: https://ci.appveyor.com/api/projects/status/8b578alg974axvux?svg=true
|
||||
[badge.gh-actions]: https://github.com/epics-base/ci-scripts/workflows/ci-scripts%20build/test/badge.svg
|
||||
|
||||
[reddit.bash]: https://www.reddit.com/r/bash/comments/393oqv/why_is_the_version_of_bash_included_in_os_x_so_old/
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
## Features
|
||||
|
||||
- One parallel runner (all builds are sequential)
|
||||
- Use different compilers (Visual Studio, gcc/MinGW)
|
||||
- Use different Visual Studio versions: \
|
||||
- Windows Server 2012/2016/2019
|
||||
- Compile using gcc/MinGW or different Visual Studio versions: \
|
||||
2008, 2010, 2012, 2013, 2015, 2017, 2019
|
||||
- Compile for Windows 32bit and 64bit
|
||||
- No useful caching available.
|
||||
|
||||
85
cue-test.py
85
cue-test.py
@@ -31,6 +31,13 @@ if 'APPVEYOR' in os.environ:
|
||||
elif re.match(r'^macOS', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
|
||||
ci_os = 'osx'
|
||||
|
||||
if 'GITHUB_ACTIONS' in os.environ:
|
||||
ci_service = 'github-actions'
|
||||
if os.environ['RUNNER_OS'] == 'macOS':
|
||||
ci_os = 'osx'
|
||||
else:
|
||||
ci_os = os.environ['RUNNER_OS'].lower()
|
||||
|
||||
|
||||
def find_in_file(regex, filename):
|
||||
file = open(filename, "r")
|
||||
@@ -324,8 +331,14 @@ class TestDefaultModuleURLs(unittest.TestCase):
|
||||
@unittest.skipIf(ci_os != 'windows', 'VCVars test only applies to windows')
|
||||
class TestVCVars(unittest.TestCase):
|
||||
def test_vcvars(self):
|
||||
if ci_service == 'appveyor':
|
||||
if ci_service == 'travis':
|
||||
os.environ['TRAVIS_COMPILER'] = 'vs2017'
|
||||
else:
|
||||
os.environ['CONFIGURATION'] = 'default'
|
||||
if ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win16':
|
||||
os.environ['CMP'] = 'vs2017'
|
||||
else:
|
||||
os.environ['CMP'] = 'vs2019'
|
||||
cue.detect_context()
|
||||
cue.with_vcvars('env')
|
||||
|
||||
@@ -676,7 +689,7 @@ class TestSetupForBuild(unittest.TestCase):
|
||||
args = Namespace(paths=[])
|
||||
cue.building_base = True
|
||||
if ci_os == 'windows':
|
||||
sp.check_call(['choco', 'install', 'make'])
|
||||
sp.check_call(['choco', 'install', 'make', 'strawberryperl', '-ry'])
|
||||
|
||||
def setUp(self):
|
||||
if ci_service == 'appveyor':
|
||||
@@ -726,10 +739,10 @@ class TestSetupForBuild(unittest.TestCase):
|
||||
|
||||
@unittest.skipIf(ci_os != 'windows', 'HostArchPlatform test only applies to windows')
|
||||
def test_HostArchPlatform(self):
|
||||
if ci_service == 'travis':
|
||||
platforms = ['x64']
|
||||
else:
|
||||
if ci_service == 'appveyor':
|
||||
platforms = ['x86', 'x64']
|
||||
else:
|
||||
platforms = ['x64']
|
||||
for platform in platforms:
|
||||
for cc in ['vs2019', 'gcc']:
|
||||
cue.ci['platform'] = platform
|
||||
@@ -750,18 +763,17 @@ class TestSetupForBuild(unittest.TestCase):
|
||||
self.assertTrue(re.search('-mingw$', os.environ['EPICS_HOST_ARCH']),
|
||||
'EPICS_HOST_ARCH (found {0}) is not -mingw for {1} / {2}'
|
||||
.format(os.environ['EPICS_HOST_ARCH'], cc, platform))
|
||||
pattern = {'x86': 'mingw32', 'x64': 'mingw64'}
|
||||
self.assertTrue(re.search(pattern[platform], os.environ['PATH']),
|
||||
'Binary location for {0} not in PATH (found {1})'
|
||||
.format(pattern[platform], os.environ['PATH']))
|
||||
if ci_service == 'appveyor':
|
||||
pattern = {'x86': 'mingw32', 'x64': 'mingw64'}
|
||||
self.assertTrue(re.search(pattern[platform], os.environ['PATH']),
|
||||
'Binary location for {0} not in PATH (found PATH = {1})'
|
||||
.format(pattern[platform], os.environ['PATH']))
|
||||
|
||||
@unittest.skipIf(ci_os != 'windows', 'Strawberry perl test only applies to windows')
|
||||
def test_StrawberryInPathVS2019(self):
|
||||
if 'APPVEYOR' in os.environ:
|
||||
os.environ['CMP'] = 'vs2019'
|
||||
def test_StrawberryInPath(self):
|
||||
cue.setup_for_build(self.args)
|
||||
self.assertTrue(re.search('strawberry', os.environ['PATH'], flags=re.IGNORECASE),
|
||||
'Strawberry Perl installed but location not in PATH (found {0})'
|
||||
'Strawberry Perl location not in PATH (found PATH = {0})'
|
||||
.format(os.environ['PATH']))
|
||||
|
||||
def setBase314(self, yesno):
|
||||
@@ -817,6 +829,44 @@ class TestSetupForBuild(unittest.TestCase):
|
||||
'Extra make arg [{0}] not set (expected "bla {0}", found "{1}")'
|
||||
.format(ind, cue.extra_makeargs[ind]))
|
||||
|
||||
|
||||
class TestHooks(unittest.TestCase):
|
||||
location = os.path.join(cue.cachedir, 'hook_test')
|
||||
bla_file = os.path.join(location, 'bla.txt')
|
||||
new_file = os.path.join(location, 'dd', 'new.txt')
|
||||
|
||||
def setUp(self):
|
||||
if os.path.exists(self.location):
|
||||
shutil.rmtree(self.location, onerror=cue.remove_readonly)
|
||||
try:
|
||||
os.makedirs(self.location)
|
||||
except:
|
||||
pass
|
||||
with open(self.bla_file, 'w') as f:
|
||||
f.write('''LINE1=YES
|
||||
LINE2=NO''')
|
||||
|
||||
def test_patchfile(self):
|
||||
hook = os.path.join(builddir, 'test.patch')
|
||||
cue.apply_patch(hook, cwd=self.location)
|
||||
line1_yes = False
|
||||
with open(self.bla_file) as f:
|
||||
if 'LINE1=YES' in f.read():
|
||||
line1_yes = True
|
||||
self.assertFalse(line1_yes, "Patch didn't change line in test file 'bla.txt'")
|
||||
self.assertTrue(os.path.exists(self.new_file), "patch didn't add new file")
|
||||
|
||||
def test_archiveZip(self):
|
||||
hook = os.path.join(builddir, 'test.zip')
|
||||
cue.extract_archive(hook, cwd=self.location)
|
||||
self.assertTrue(os.path.exists(self.new_file), "archive extract didn't add new file")
|
||||
|
||||
def test_archive7z(self):
|
||||
hook = os.path.join(builddir, 'test.7z')
|
||||
cue.extract_archive(hook, cwd=self.location)
|
||||
self.assertTrue(os.path.exists(self.new_file), "archive extract didn't add new file")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if 'VV' in os.environ and os.environ['VV'] == '1':
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
@@ -827,5 +877,14 @@ if __name__ == "__main__":
|
||||
if sys.argv[1:] == ['env']:
|
||||
# testing with_vcvars
|
||||
[print(K, '=', V) for K, V in os.environ.items()]
|
||||
elif ci_os == 'windows' and sys.argv[1:] == ['findvs']:
|
||||
from fnmatch import fnmatch
|
||||
print('Available Visual Studio versions')
|
||||
for base in (r'C:\Program Files (x86)', r'C:\Program Files'):
|
||||
for root, dirs, files in os.walk(base):
|
||||
for fname in files:
|
||||
if fnmatch(fname, 'vcvarsall.bat'):
|
||||
print('Found', os.path.join(root, fname))
|
||||
sys.stdout.flush()
|
||||
else:
|
||||
unittest.main()
|
||||
|
||||
231
cue.py
231
cue.py
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env python
|
||||
"""CI build script for Linux/MacOS/Windows on Travis/AppVeyor
|
||||
"""CI build script for Linux/MacOS/Windows on Travis/AppVeyor/GitHub-Actions
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
@@ -22,11 +22,10 @@ def detect_context():
|
||||
ci['os'] = os.environ['TRAVIS_OS_NAME']
|
||||
ci['platform'] = 'x64'
|
||||
ci['compiler'] = os.environ['TRAVIS_COMPILER']
|
||||
if ci['os'] == 'windows':
|
||||
ci['choco'] += ['strawberryperl']
|
||||
if re.match(r'^vs', ci['compiler']):
|
||||
# Only Visual Studio 2017 available
|
||||
ci['compiler'] = 'vs2017'
|
||||
ci['choco'] += ['strawberryperl']
|
||||
if re.match(r'^vs', ci['compiler']):
|
||||
# Only Visual Studio 2017 available
|
||||
ci['compiler'] = 'vs2017'
|
||||
if 'BCFG' in os.environ:
|
||||
buildconfig = os.environ['BCFG'].lower()
|
||||
|
||||
@@ -43,6 +42,24 @@ def detect_context():
|
||||
ci['compiler'] = os.environ['CMP']
|
||||
buildconfig = os.environ['CONFIGURATION'].lower()
|
||||
|
||||
if 'GITHUB_ACTIONS' in os.environ:
|
||||
ci['service'] = 'github-actions'
|
||||
if os.environ['RUNNER_OS'] == 'macOS':
|
||||
ci['os'] = 'osx'
|
||||
else:
|
||||
ci['os'] = os.environ['RUNNER_OS'].lower()
|
||||
ci['platform'] = 'x64'
|
||||
if 'CMP' in os.environ:
|
||||
ci['compiler'] = os.environ['CMP']
|
||||
ci['choco'] += ['strawberryperl']
|
||||
if 'BCFG' in os.environ:
|
||||
buildconfig = os.environ['BCFG'].lower()
|
||||
|
||||
if re.search('static', buildconfig):
|
||||
ci['static'] = True
|
||||
if re.search('debug', buildconfig):
|
||||
ci['debug'] = True
|
||||
|
||||
if 'STATIC' in os.environ:
|
||||
print("{0}WARNING: Variable 'STATIC' not supported anymore; use 'BCFG' instead{1}"
|
||||
.format(ANSI_RED, ANSI_RESET))
|
||||
@@ -52,11 +69,6 @@ def detect_context():
|
||||
.format(ANSI_RED, buildconfig, ANSI_RESET))
|
||||
sys.stdout.flush()
|
||||
|
||||
if re.search('static', buildconfig):
|
||||
ci['static'] = True
|
||||
if re.search('debug', buildconfig):
|
||||
ci['debug'] = True
|
||||
|
||||
if ci['static']:
|
||||
ci['configuration'] = 'static'
|
||||
else:
|
||||
@@ -71,6 +83,12 @@ def detect_context():
|
||||
if 'CHOCO' in os.environ:
|
||||
ci['choco'].extend(os.environ['CHOCO'].split())
|
||||
|
||||
if 'APT' in os.environ:
|
||||
ci['apt'].extend(os.environ['APT'].split())
|
||||
|
||||
if 'BREW' in os.environ:
|
||||
ci['homebrew'].extend(os.environ['BREW'].split())
|
||||
|
||||
ci['test'] = True
|
||||
if 'TEST' in os.environ and os.environ['TEST'].lower() == 'no':
|
||||
ci['test'] = False
|
||||
@@ -79,8 +97,14 @@ def detect_context():
|
||||
if 'PARALLEL_MAKE' in os.environ:
|
||||
ci['parallel_make'] = os.environ['PARALLEL_MAKE']
|
||||
|
||||
logger.debug('Detected a build hosted on %s, using %s on %s (%s) configured as %s (test: %s)',
|
||||
ci['service'], ci['compiler'], ci['os'], ci['platform'], ci['configuration'], ci['test'])
|
||||
ci['clean_deps'] = True
|
||||
if 'CLEAN_DEPS' in os.environ and os.environ['CLEAN_DEPS'].lower() == 'no':
|
||||
ci['clean_deps'] = False
|
||||
|
||||
logger.debug('Detected a build hosted on %s, using %s on %s (%s) configured as %s '
|
||||
+ '(test: %s, clean_deps: %s)',
|
||||
ci['service'], ci['compiler'], ci['os'], ci['platform'], ci['configuration'],
|
||||
ci['test'], ci['clean_deps'])
|
||||
|
||||
|
||||
curdir = os.getcwd()
|
||||
@@ -97,6 +121,7 @@ is_make3 = False
|
||||
has_test_results = False
|
||||
silent_dep_builds = True
|
||||
do_recompile = False
|
||||
installed_7z = False
|
||||
|
||||
|
||||
def clear_lists():
|
||||
@@ -120,6 +145,8 @@ def clear_lists():
|
||||
ci['configuration'] = '<unknown>'
|
||||
ci['scriptsdir'] = ''
|
||||
ci['choco'] = ['make']
|
||||
ci['apt'] = []
|
||||
ci['homebrew'] = []
|
||||
|
||||
|
||||
clear_lists()
|
||||
@@ -143,11 +170,16 @@ ANSI_CLEAR = "\033[0K"
|
||||
|
||||
# Travis log fold control
|
||||
# from https://github.com/travis-ci/travis-rubies/blob/build/build.sh
|
||||
# GitHub Actions fold control
|
||||
# from https://github.com/actions/toolkit/blob/master/docs/commands.md#group-and-ungroup-log-lines
|
||||
|
||||
def fold_start(tag, title):
|
||||
if ci['service'] == 'travis':
|
||||
print('travis_fold:start:{0}{1}{2}{3}'
|
||||
.format(tag, ANSI_YELLOW, title, ANSI_RESET))
|
||||
elif ci['service'] == 'github-actions':
|
||||
print('::group::{0}{1}{2}'
|
||||
.format(ANSI_YELLOW, title, ANSI_RESET))
|
||||
elif ci['service'] == 'appveyor':
|
||||
print('{0}===== \\/ \\/ \\/ ===== START: {1} ====={2}'
|
||||
.format(ANSI_YELLOW, title, ANSI_RESET))
|
||||
@@ -158,6 +190,9 @@ def fold_end(tag, title):
|
||||
if ci['service'] == 'travis':
|
||||
print('\ntravis_fold:end:{0}\r'
|
||||
.format(tag), end='')
|
||||
elif ci['service'] == 'github-actions':
|
||||
print('::endgroup::'
|
||||
.format(ANSI_YELLOW, title, ANSI_RESET))
|
||||
elif ci['service'] == 'appveyor':
|
||||
print('{0}----- /\\ /\\ /\\ ----- END: {1} -----{2}'
|
||||
.format(ANSI_YELLOW, title, ANSI_RESET))
|
||||
@@ -171,7 +206,7 @@ elif 'HOME' in os.environ:
|
||||
homedir = os.getenv('HOME')
|
||||
cachedir = os.path.join(homedir, '.cache')
|
||||
toolsdir = os.path.join(homedir, '.tools')
|
||||
rtemsdir = os.path.join(homedir, '.rtems')
|
||||
rtemsdir = r'/home/travis/.rtems' # Preliminary, until the next generation of toolchain
|
||||
|
||||
if 'CACHEDIR' in os.environ:
|
||||
cachedir = os.environ['CACHEDIR']
|
||||
@@ -179,8 +214,10 @@ if 'CACHEDIR' in os.environ:
|
||||
|
||||
vcvars_table = {
|
||||
# https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History
|
||||
'vs2019': [r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat'],
|
||||
'vs2019': [r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat',
|
||||
r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'],
|
||||
'vs2017': [r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat',
|
||||
r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat',
|
||||
r'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat'],
|
||||
'vs2015': [r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'],
|
||||
'vs2013': [r'C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat'],
|
||||
@@ -271,9 +308,9 @@ def source_set(name):
|
||||
setup[assign[0]] = assign[1]
|
||||
logger.debug('Done with setup file %s', set_file)
|
||||
break
|
||||
else:
|
||||
raise NameError("{0}Setup file {1}.set does not exist in SETUP_PATH search path ({2}){3}"
|
||||
.format(ANSI_RED, name, setup_dirs, ANSI_RESET))
|
||||
else:
|
||||
raise NameError("{0}Setup file {1}.set does not exist in SETUP_PATH search path ({2}){3}"
|
||||
.format(ANSI_RED, name, setup_dirs, ANSI_RESET))
|
||||
|
||||
|
||||
# update_release_local(var, location)
|
||||
@@ -367,6 +404,24 @@ def call_make(args=[], **kws):
|
||||
sys.exit(exitcode)
|
||||
|
||||
|
||||
def apply_patch(file, **kws):
|
||||
place = kws.get('cwd', os.getcwd())
|
||||
print('Applying patch {0} in {1}'.format(file, place))
|
||||
logger.debug("EXEC '%s' in %s", ' '.join(['patch', '-p1', '-i', file]), place)
|
||||
sys.stdout.flush()
|
||||
sp.check_call(['patch', '-p1', '-i', file], cwd=place)
|
||||
logger.debug('EXEC DONE')
|
||||
|
||||
|
||||
def extract_archive(file, **kws):
|
||||
place = kws.get('cwd', os.getcwd())
|
||||
print('Extracting archive {0} in {1}'.format(file, place))
|
||||
logger.debug("EXEC '%s' in %s", ' '.join(['7z', 'x', '-aoa', '-bd', file]), place)
|
||||
sys.stdout.flush()
|
||||
sp.check_call(['7z', 'x', '-aoa', '-bd', file], cwd=place)
|
||||
logger.debug('EXEC DONE')
|
||||
|
||||
|
||||
def get_git_hash(place):
|
||||
logger.debug("EXEC 'git log -n1 --pretty=format:%%H' in %s", place)
|
||||
sys.stdout.flush()
|
||||
@@ -479,13 +534,19 @@ def add_dependency(dep):
|
||||
with open(release, 'w') as fout:
|
||||
print('-include $(TOP)/../RELEASE.local', file=fout)
|
||||
|
||||
# run hook if defined
|
||||
# Apply HOOK
|
||||
if dep + '_HOOK' in setup:
|
||||
hook = os.path.join(place, setup[dep + '_HOOK'])
|
||||
if os.path.exists(hook):
|
||||
print('Running hook {0} in {1}'.format(setup[dep + '_HOOK'], place))
|
||||
sys.stdout.flush()
|
||||
sp.check_call(hook, shell=True, cwd=place)
|
||||
hook = setup[dep + '_HOOK']
|
||||
hook_file = os.path.join(curdir, hook)
|
||||
if os.path.exists(hook_file):
|
||||
if re.match(r'.+\\.patch$', hook):
|
||||
apply_patch(hook_file, cwd=place)
|
||||
elif re.match(r'.+\\.(zip|7z)$', hook):
|
||||
extract_archive(hook_file, cwd=place)
|
||||
else:
|
||||
print('Running hook {0} in {1}'.format(hook, place))
|
||||
sys.stdout.flush()
|
||||
sp.check_call(hook_file, shell=True, cwd=place)
|
||||
|
||||
# write checked out commit hash to marker file
|
||||
head = get_git_hash(place)
|
||||
@@ -541,32 +602,34 @@ def setup_for_build(args):
|
||||
global is_base314, has_test_results, is_make3
|
||||
dllpaths = []
|
||||
|
||||
logger.debug('Setting up the build environment')
|
||||
|
||||
if ci['os'] == 'windows':
|
||||
if ci['service'] == 'appveyor':
|
||||
if ci['compiler'] == 'vs2019':
|
||||
# put strawberry perl in the PATH
|
||||
os.environ['PATH'] = os.pathsep.join([os.path.join(r'C:\Strawberry\perl\site\bin'),
|
||||
os.path.join(r'C:\Strawberry\perl\bin'),
|
||||
os.environ['PATH']])
|
||||
if ci['compiler'] == 'gcc':
|
||||
if 'INCLUDE' not in os.environ:
|
||||
os.environ['INCLUDE'] = ''
|
||||
if ci['platform'] == 'x86':
|
||||
os.environ['INCLUDE'] = os.pathsep.join(
|
||||
[r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include',
|
||||
os.environ['INCLUDE']])
|
||||
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin',
|
||||
os.environ['PATH']])
|
||||
elif ci['platform'] == 'x64':
|
||||
os.environ['INCLUDE'] = os.pathsep.join(
|
||||
[r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include',
|
||||
os.environ['INCLUDE']])
|
||||
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin',
|
||||
os.environ['PATH']])
|
||||
if ci['service'] == 'travis':
|
||||
os.environ['PATH'] = os.pathsep.join([r'C:\Strawberry\perl\site\bin', r'C:\Strawberry\perl\bin',
|
||||
if os.path.exists(r'C:\Strawberry\perl\bin'):
|
||||
# Put strawberry perl in front of the PATH (so that Git Perl is further behind)
|
||||
logger.debug('Adding Strawberry Perl in front of the PATH')
|
||||
os.environ['PATH'] = os.pathsep.join([r'C:\Strawberry\c\bin',
|
||||
r'C:\Strawberry\perl\site\bin',
|
||||
r'C:\Strawberry\perl\bin',
|
||||
os.environ['PATH']])
|
||||
|
||||
if ci['service'] == 'appveyor' and ci['compiler'] == 'gcc':
|
||||
logger.debug('Adding AppVeyor MSYS2/MinGW installation to PATH and INCLUDE')
|
||||
if 'INCLUDE' not in os.environ:
|
||||
os.environ['INCLUDE'] = ''
|
||||
if ci['platform'] == 'x86':
|
||||
os.environ['INCLUDE'] = os.pathsep.join(
|
||||
[r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include',
|
||||
os.environ['INCLUDE']])
|
||||
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin',
|
||||
os.environ['PATH']])
|
||||
elif ci['platform'] == 'x64':
|
||||
os.environ['INCLUDE'] = os.pathsep.join(
|
||||
[r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include',
|
||||
os.environ['INCLUDE']])
|
||||
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin',
|
||||
os.environ['PATH']])
|
||||
|
||||
# Find BASE location
|
||||
if not building_base:
|
||||
with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f:
|
||||
@@ -578,6 +641,8 @@ def setup_for_build(args):
|
||||
else:
|
||||
places['EPICS_BASE'] = '.'
|
||||
|
||||
logger.debug('Using EPICS Base at %s', places['EPICS_BASE'])
|
||||
|
||||
detect_epics_host_arch()
|
||||
|
||||
if ci['os'] == 'windows':
|
||||
@@ -601,6 +666,7 @@ def setup_for_build(args):
|
||||
with open(cfg_base_version) as myfile:
|
||||
if 'BASE_3_14=YES' in myfile.read():
|
||||
is_base314 = True
|
||||
logger.debug('Check if EPICS Base is a 3.14 series: %s', is_base314)
|
||||
|
||||
if not is_base314:
|
||||
rules_build = os.path.join(places['EPICS_BASE'], 'configure', 'RULES_BUILD')
|
||||
@@ -613,6 +679,7 @@ def setup_for_build(args):
|
||||
# Check make version
|
||||
if re.match(r'^GNU Make 3', sp.check_output(['make', '-v']).decode('ascii')):
|
||||
is_make3 = True
|
||||
logger.debug('Check if make is a 3.x series: %s', is_make3)
|
||||
|
||||
# apparently %CD% is handled automagically
|
||||
os.environ['TOP'] = os.getcwd()
|
||||
@@ -634,6 +701,21 @@ def setup_for_build(args):
|
||||
extra_makeargs.append(os.environ[tag])
|
||||
|
||||
|
||||
def fix_etc_hosts():
|
||||
# Several travis-ci images throw us a curveball in /etc/hosts
|
||||
# by including two entries for localhost. The first for 127.0.1.1
|
||||
# causes epicsSockResolveTest to fail.
|
||||
# cat /etc/hosts
|
||||
# ...
|
||||
# 127.0.1.1 localhost localhost ip4-loopback
|
||||
# 127.0.0.1 localhost nettuno travis vagrant travis-job-....
|
||||
|
||||
logger.debug("EXEC sudo sed -ie '/^127\\.0\\.1\\.1/ s|localhost\\s*||g' /etc/hosts")
|
||||
sys.stdout.flush()
|
||||
sp.call(['sudo', 'sed', '-ie', '/^127\\.0\\.1\\.1/ s|localhost\\s*||g', '/etc/hosts'])
|
||||
logger.debug('EXEC DONE')
|
||||
|
||||
|
||||
def prepare(args):
|
||||
host_info()
|
||||
|
||||
@@ -654,6 +736,9 @@ def prepare(args):
|
||||
|
||||
logger.debug('Effective module list: %s', modlist())
|
||||
|
||||
if ci['service'] == 'travis' and ci['os'] == 'linux':
|
||||
fix_etc_hosts()
|
||||
|
||||
# we're working with tags (detached heads) a lot: suppress advice
|
||||
call_git(['config', '--global', 'advice.detachedHead', 'false'])
|
||||
|
||||
@@ -753,14 +838,17 @@ CROSS_COMPILER_TARGET_ARCHS += windows-x64-mingw''')
|
||||
RTEMS_VERSION={0}
|
||||
RTEMS_BASE={1}'''.format(os.environ['RTEMS'], rtemsdir))
|
||||
|
||||
# Base 3.15 doesn't have -qemu target architecture
|
||||
qemu_suffix = ''
|
||||
if os.path.exists(os.path.join(places['EPICS_BASE'], 'configure', 'os',
|
||||
# Patch Base 3.15 that doesn't have -qemu target architecture
|
||||
if not os.path.exists(os.path.join(places['EPICS_BASE'], 'configure', 'os',
|
||||
'CONFIG.Common.RTEMS-pc386-qemu')):
|
||||
qemu_suffix = '-qemu'
|
||||
print('Adding RTEMS-pc386-qemu target to Base in {0}'.format(places['EPICS_BASE']))
|
||||
sys.stdout.flush()
|
||||
sp.check_call(['patch', '-p1', '-i',
|
||||
os.path.join(ci['scriptsdir'], 'add-RTEMS-pc368-qemu-target.patch')],
|
||||
cwd=places['EPICS_BASE'])
|
||||
with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG_SITE'), 'a') as f:
|
||||
f.write('''
|
||||
CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386{0}'''.format(qemu_suffix))
|
||||
CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu''')
|
||||
|
||||
host_ccmplr_name = re.sub(r'^([a-zA-Z][^-]*(-[a-zA-Z][^-]*)*)+(-[0-9.]|)$', r'\1', ci['compiler'])
|
||||
host_cmplr_ver_suffix = re.sub(r'^([a-zA-Z][^-]*(-[a-zA-Z][^-]*)*)+(-[0-9.]|)$', r'\3', ci['compiler'])
|
||||
@@ -791,20 +879,24 @@ CMPLR_CLASS = clang''')
|
||||
CC = {0}{2}
|
||||
CCC = {1}{2}'''.format(host_ccmplr_name, host_cppcmplr_name, host_cmplr_ver_suffix))
|
||||
|
||||
# Add additional flags to CONFIG_SITE
|
||||
flags_text = ''
|
||||
# Add additional settings to CONFIG_SITE
|
||||
extra_config = ''
|
||||
if 'USR_CPPFLAGS' in os.environ:
|
||||
flags_text += '''
|
||||
extra_config += '''
|
||||
USR_CPPFLAGS += {0}'''.format(os.environ['USR_CPPFLAGS'])
|
||||
if 'USR_CFLAGS' in os.environ:
|
||||
flags_text += '''
|
||||
extra_config += '''
|
||||
USR_CFLAGS += {0}'''.format(os.environ['USR_CFLAGS'])
|
||||
if 'USR_CXXFLAGS' in os.environ:
|
||||
flags_text += '''
|
||||
extra_config += '''
|
||||
USR_CXXFLAGS += {0}'''.format(os.environ['USR_CXXFLAGS'])
|
||||
if flags_text:
|
||||
if ci['service'] == 'github-actions' and ci['os'] == 'windows':
|
||||
extra_config += '''
|
||||
PERL = C:/Strawberry/perl/bin/perl -CSD'''
|
||||
|
||||
if extra_config:
|
||||
with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG_SITE'), 'a') as f:
|
||||
f.write(flags_text)
|
||||
f.write(extra_config)
|
||||
|
||||
fold_end('set.up.epics_build', 'Configuring EPICS build system')
|
||||
|
||||
@@ -813,9 +905,19 @@ USR_CXXFLAGS += {0}'''.format(os.environ['USR_CXXFLAGS'])
|
||||
|
||||
if ci['os'] == 'windows' and ci['choco']:
|
||||
fold_start('install.choco', 'Installing CHOCO packages')
|
||||
sp.check_call(['choco', 'install'] + ci['choco'])
|
||||
sp.check_call(['choco', 'install'] + ci['choco'] + ['-y', '--limitoutput', '--no-progress'])
|
||||
fold_end('install.choco', 'Installing CHOCO packages')
|
||||
|
||||
if ci['os'] == 'linux' and ci['apt']:
|
||||
fold_start('install.apt', 'Installing APT packages')
|
||||
sp.check_call(['sudo', 'apt-get', '-y', 'install'] + ci['apt'])
|
||||
fold_end('install.apt', 'Installing APT packages')
|
||||
|
||||
if ci['os'] == 'osx' and ci['homebrew']:
|
||||
fold_start('install.homebrew', 'Installing Homebrew packages')
|
||||
sp.check_call(['brew', 'install'] + ci['homebrew'])
|
||||
fold_end('install.homebrew', 'Installing Homebrew packages')
|
||||
|
||||
if ci['os'] == 'linux' and 'RTEMS' in os.environ:
|
||||
tar_name = 'i386-rtems{0}-trusty-20171203-{0}.tar.bz2'.format(os.environ['RTEMS'])
|
||||
print('Downloading RTEMS {0} cross compiler: {1}'
|
||||
@@ -825,7 +927,10 @@ USR_CXXFLAGS += {0}'''.format(os.environ['USR_CXXFLAGS'])
|
||||
'https://github.com/mdavidsaver/rsb/releases/download/20171203-{0}/{1}'
|
||||
.format(os.environ['RTEMS'], tar_name)],
|
||||
cwd=toolsdir)
|
||||
sp.check_call(['tar', '-C', '/', '-xmj', '-f', os.path.join(toolsdir, tar_name)])
|
||||
sudo_prefix = []
|
||||
if ci['service'] == 'github-actions':
|
||||
sudo_prefix = ['sudo']
|
||||
sp.check_call(sudo_prefix + ['tar', '-C', '/', '-xmj', '-f', os.path.join(toolsdir, tar_name)])
|
||||
os.remove(os.path.join(toolsdir, tar_name))
|
||||
|
||||
setup_for_build(args)
|
||||
@@ -854,6 +959,8 @@ USR_CXXFLAGS += {0}'''.format(os.environ['USR_CXXFLAGS'])
|
||||
place = places[setup[mod + "_VARNAME"]]
|
||||
print('{0}Building dependency {1} in {2}{3}'.format(ANSI_YELLOW, mod, place, ANSI_RESET))
|
||||
call_make(cwd=place, silent=silent_dep_builds)
|
||||
if ci['clean_deps']:
|
||||
call_make(args=['clean'], cwd=place, silent=silent_dep_builds)
|
||||
fold_end('build.dependencies', 'Build missing/outdated dependencies')
|
||||
|
||||
print('{0}Dependency module information{1}'.format(ANSI_CYAN, ANSI_RESET))
|
||||
@@ -876,7 +983,7 @@ USR_CXXFLAGS += {0}'''.format(os.environ['USR_CXXFLAGS'])
|
||||
def build(args):
|
||||
setup_for_build(args)
|
||||
fold_start('build.module', 'Build the main module')
|
||||
call_make(args.makeargs)
|
||||
call_make(args.makeargs, use_extra=True)
|
||||
fold_end('build.module', 'Build the main module')
|
||||
|
||||
|
||||
|
||||
69
github-actions/README.md
Normal file
69
github-actions/README.md
Normal file
@@ -0,0 +1,69 @@
|
||||
# GitHub Actions Scripts for EPICS Modules
|
||||
|
||||
## Features
|
||||
|
||||
- 20 parallel runners on Linux/Windows (5 runners on MacOS)
|
||||
- Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
|
||||
- Compile natively on Linux (gcc, clang)
|
||||
- Compile natively on MacOS (clang)
|
||||
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
|
||||
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
|
||||
- Cross-compile for RTEMS 4.9 and 4.10 (Base >= 3.15)
|
||||
- Caching not supported yet.
|
||||
|
||||
## How to Use these Scripts
|
||||
|
||||
1. Add the ci-scripts respository as a Git Submodule
|
||||
(see [README](../README.md) one level above).
|
||||
|
||||
2. Add settings files defining which dependencies in which versions
|
||||
you want to build against
|
||||
(see [README](../README.md) one level above).
|
||||
|
||||
3. Create a GitHub Actions configuration by copying one of the workflow
|
||||
examples into the directory `.github/workflows` of your module.
|
||||
```bash
|
||||
$ mkdir -p .github/workflows
|
||||
$ cp .ci/github-actions/ci-scripts-build.yml.example-full .github/workflows/ci-scripts-build.yml
|
||||
```
|
||||
|
||||
4. Edit the workflow configuration to include the build jobs you want
|
||||
GitHub Actions to run.
|
||||
|
||||
Build jobs are specified in the `jobs: <job-name>: strategy:`
|
||||
declaration. The `matrix:` element specifies the axes as configuration
|
||||
parameters with their lists of values,
|
||||
`env:` (on the build level) controls the setting of environment variables
|
||||
(which can be matrix parameters).
|
||||
The `runs-on:` setting specifies the image (operating system) of the
|
||||
runner.
|
||||
The `name:` is what shows up in the web interface for the workflow,
|
||||
builds and jobs, and the elements under `steps:` describe the actions
|
||||
executed for each job of the matrix.
|
||||
|
||||
Please check the comments in the examples for more hints, and the
|
||||
[GitHub Actions documentation](https://help.github.com/en/actions)
|
||||
for a lot more options and details.
|
||||
|
||||
5. Push your changes and click on the `Actions` tab of your GitHub repository
|
||||
page to see your build results.
|
||||
|
||||
## Specifics
|
||||
|
||||
#### Quote Environment Variable Values
|
||||
|
||||
Variable settings distinguish between numerical and string values.
|
||||
Better quote all branch and tag names. E.g.,
|
||||
```yaml
|
||||
env:
|
||||
BASE: "7.0"
|
||||
```
|
||||
to avoid ci-scripts trying to `git clone` with `--branch 7`.
|
||||
|
||||
## Caches
|
||||
|
||||
GitHub Actions provides caching of dependencies.
|
||||
|
||||
However, since their cache restore and create algorithm is fundamentally
|
||||
different from those used by Travis and AppVeyor, this will require some
|
||||
more changes in ci-scripts to work. Be patient.
|
||||
162
github-actions/ci-scripts-build.yml.example-full
Normal file
162
github-actions/ci-scripts-build.yml.example-full
Normal file
@@ -0,0 +1,162 @@
|
||||
# .github/workflows/ci-scripts-build.yml for use with EPICS Base ci-scripts
|
||||
# (see: https://github.com/epics-base/ci-scripts)
|
||||
|
||||
# This is YAML - indentation levels are crucial
|
||||
|
||||
# Set the 'name:' properties to values that work for you (MYMODULE)
|
||||
|
||||
name: MYMODULE ci-scripts build
|
||||
|
||||
# Trigger on pushes and PRs to any branch
|
||||
on: [push, pull_request]
|
||||
|
||||
env:
|
||||
SETUP_PATH: .ci-local:.ci
|
||||
CMP: gcc
|
||||
# For the sequencer on Linux/Windows/MacOS
|
||||
APT: re2c
|
||||
CHOCO: re2c
|
||||
BREW: re2c
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
# Set environment variables from matrix parameters
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
|
||||
cmp: [gcc, clang]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: true
|
||||
- name: Prepare and compile dependencies
|
||||
run: python .ci/cue.py prepare
|
||||
- name: Build main module
|
||||
run: python .ci/cue.py build
|
||||
- name: Run main module tests
|
||||
run: python .ci/cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python .ci/cue.py test-results
|
||||
|
||||
build-macos:
|
||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
# Set environment variables from matrix parameters
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [macos-10.15]
|
||||
cmp: [clang]
|
||||
# No static builds on MacOS
|
||||
configuration: [default, debug]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Prepare and compile dependencies
|
||||
run: python .ci/cue.py prepare
|
||||
- name: Build main module
|
||||
run: python .ci/cue.py build
|
||||
- name: Run main module tests
|
||||
run: python .ci/cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python .ci/cue.py test-results
|
||||
|
||||
build-windows:
|
||||
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [windows-2019, windows-2016]
|
||||
cmp: [gcc, vs2019, vs2017]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
# Available: vs2017/windows-2016 and vs2019/windows-2019
|
||||
exclude:
|
||||
- os: windows-2019
|
||||
cmp: vs2017
|
||||
- os: windows-2016
|
||||
cmp: vs2019
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: true
|
||||
- name: Prepare and compile dependencies
|
||||
run: python .ci/cue.py prepare
|
||||
- name: Build main module
|
||||
run: python .ci/cue.py build
|
||||
- name: Run main module tests
|
||||
run: python .ci/cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python .ci/cue.py test-results
|
||||
|
||||
# Same setup and toolchain as on Travis.
|
||||
# Needs Base >= 3.15 to compile, EPICS 7 to also run the tests on qemu
|
||||
build-rtems:
|
||||
name: RTEMS${{ matrix.rtems }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
RTEMS: ${{ matrix.rtems }}
|
||||
APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-18.04]
|
||||
cmp: [gcc]
|
||||
configuration: [default]
|
||||
rtems: ["4.9", "4.10"]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: true
|
||||
- name: Prepare and compile dependencies
|
||||
run: python .ci/cue.py prepare
|
||||
- name: Build main module
|
||||
run: python .ci/cue.py build
|
||||
- name: Run main module tests
|
||||
run: python .ci/cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python .ci/cue.py test-results
|
||||
|
||||
# The WINE cross builds are of somewhat limited use,
|
||||
# as there are native gcc/MinGW builds available on GitHub Actions
|
||||
build-wine:
|
||||
name: WINE${{ matrix.wine }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
WINE: ${{ matrix.wine }}
|
||||
APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-18.04]
|
||||
cmp: [gcc]
|
||||
configuration: [default, static, debug, static-debug]
|
||||
wine: [32, 64]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: true
|
||||
- name: Prepare and compile dependencies
|
||||
run: python .ci/cue.py prepare
|
||||
- name: Build main module
|
||||
run: python .ci/cue.py build
|
||||
- name: Run main module tests
|
||||
run: python .ci/cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python .ci/cue.py test-results
|
||||
44
github-actions/ci-scripts-build.yml.example-mini
Normal file
44
github-actions/ci-scripts-build.yml.example-mini
Normal file
@@ -0,0 +1,44 @@
|
||||
# .github/workflows/ci-scripts-build.yml for use with EPICS Base ci-scripts
|
||||
# (see: https://github.com/epics-base/ci-scripts)
|
||||
|
||||
# This is YAML - indentation levels are crucial
|
||||
|
||||
# Set the 'name:' properties to values that work for you
|
||||
|
||||
name: MYMODULE ci-scripts build
|
||||
|
||||
# Trigger on pushes and PRs to any branch
|
||||
on: [push, pull_request]
|
||||
|
||||
env:
|
||||
SETUP_PATH: .ci-local:.ci
|
||||
CMP: gcc
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
name: ${{ matrix.base }} / ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
# Set environment variables from matrix parameters
|
||||
env:
|
||||
CMP: ${{ matrix.cmp }}
|
||||
BCFG: ${{ matrix.configuration }}
|
||||
BASE: ${{ matrix.base }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-18.04]
|
||||
cmp: [gcc]
|
||||
configuration: [default, static]
|
||||
base: ["7.0", "3.15"]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: true
|
||||
- name: Prepare and compile dependencies
|
||||
run: python .ci/cue.py prepare
|
||||
- name: Build main module
|
||||
run: python .ci/cue.py build
|
||||
- name: Run main module tests
|
||||
run: python .ci/cue.py test
|
||||
- name: Collect and show test results
|
||||
run: python .ci/cue.py test-results
|
||||
14
test.patch
Normal file
14
test.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
diff -ruN a/bla.txt b/bla.txt
|
||||
--- a/bla.txt 2020-06-19 18:54:43.129076711 +0200
|
||||
+++ b/bla.txt 2020-06-19 18:55:05.093948316 +0200
|
||||
@@ -1,3 +1,3 @@
|
||||
-LINE1=YES
|
||||
+LINE1=NO
|
||||
LINE2=NO
|
||||
|
||||
diff -ruN a/dd/new.txt b/dd/new.txt
|
||||
--- a/dd/new.txt 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/dd/new.txt 2020-06-19 18:55:35.255032413 +0200
|
||||
@@ -0,0 +1,2 @@
|
||||
+NEW LINE 1
|
||||
+NEW LINE 2
|
||||
@@ -31,10 +31,14 @@ addons:
|
||||
- g++-mingw-w64-x86-64
|
||||
# for RTEMS cross builds
|
||||
- qemu-system-x86
|
||||
# for .zip/.7z archive hooks
|
||||
- p7zip-full
|
||||
homebrew:
|
||||
packages:
|
||||
# for the sequencer
|
||||
- re2c
|
||||
# for .zip/.7z archive hooks
|
||||
- p7zip
|
||||
update: true
|
||||
|
||||
install:
|
||||
|
||||
@@ -60,3 +60,9 @@ configuration.)
|
||||
|
||||
Caches are automatically removed after approx. four weeks.
|
||||
Your jobs will have to rebuild them once in a while.
|
||||
|
||||
## Miscellanea
|
||||
|
||||
To use the feature to extract `.zip`/`.7z` archives by setting
|
||||
`*_HOOK` variables, the Linux and MacOS runners need the APT package
|
||||
`p7zip-full` resp. the Homebrew package `p7zip` installed.
|
||||
|
||||
Reference in New Issue
Block a user