Skip to content

Commit bcc1e05

Browse files
committed
More fixes for appveyor and github actions stemming from fact that boost is of different version of VS 2019 image and flex is also unavailable right now on GitHub Actions image
1 parent f58ec2f commit bcc1e05

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- name: Build Makefile
1515
env: # Currently BOOST_ROOT is defined but not installed: https://github.com/actions/virtual-environments/issues/83
1616
BOOST_ROOT:
17-
run: | # Also no bison at the moment: https://github.com/actions/virtual-environments/issues/86
18-
sudo apt install bison
17+
run: | # Also no flex/bison at the moment: https://github.com/actions/virtual-environments/issues/86
18+
sudo apt install flex bison
1919
pwd
2020
cd code
2121
make

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ and currently have all check-ins validated in the following configurations:
132132
| Linux | 4.9 | 3.4 |
133133
| OSX | 4.9 | 3.5 |
134134
135-
| [![Build Status: Visual C++](https://ci.appveyor.com/api/projects/status/github/solodon4/mach7?branch=master&svg=true)](https://ci.appveyor.com/project/solodon4/mach7) | 2017 | 2015 | 2013 | 2012 | 2010 | /analyze |
136-
|-------|------|------|------|------|------|------|
137-
| x86 | OK | OK | OK | OK | OK | OK |
138-
| x64 | OK | OK | OK | OK | N/A | OK |
135+
| [![Build Status: Visual C++](https://ci.appveyor.com/api/projects/status/github/solodon4/mach7?branch=master&svg=true)](https://ci.appveyor.com/project/solodon4/mach7) | 2019 | 2017 | 2015 | 2013 | 2012 | 2010 | /analyze |
136+
|-------|------|------|------|------|------|------|------|
137+
| x86 | Fail | OK | OK | OK | OK | OK | OK |
138+
| x64 | Fail | OK | OK | OK | OK | N/A | OK |
139139
140140
[![Build Status: GitHub Actions](https://github.com/solodon4/Mach7/workflows/CI/badge.svg)](https://github.com/solodon4/Mach7/actions)
141141
@@ -260,6 +260,7 @@ Similarly, to build and run all the timing tests:
260260
tmp - Keep temporaries
261261
<ver> - Use a specific version of Visual Studio to compile the source
262262
code. <ver> can be one of the following:
263+
- 2019 - Visual C++ 16.0
263264
- 2017 - Visual C++ 15.0
264265
- 2015 - Visual C++ 14.0
265266
- 2013 - Visual C++ 12.0

appveyor.yml

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ environment:
3939
matrix:
4040
- toolset: 2019
4141
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
42+
BOOST_ROOT: C:\Libraries\boost_1_71_0
43+
BOOST_LIBRARYDIR: C:\Libraries\boost_1_71_0\lib64-msvc-14.0
4244
- toolset: 2017
4345
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
4446
- toolset: 2015

0 commit comments

Comments
 (0)