Update and fix Mac CI builds
- GitHub discontinued Actions runners for macos-10 and macos-11, so we build cboe on macos-12 now - The path to Xcode.app has changed - mac scons build wanted a new include statement for vector - hint scons to look for boost 1.85, not 1.58.
This commit is contained in:
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@@ -12,9 +12,9 @@
|
|||||||
|
|
||||||
jobs: {
|
jobs: {
|
||||||
macos-xcode: {
|
macos-xcode: {
|
||||||
runs-on: macos-10.15,
|
runs-on: macos-12,
|
||||||
env: {
|
env: {
|
||||||
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
|
DEVELOPER_DIR: /Applications/Xcode_13.4.app/Contents/Developer
|
||||||
},
|
},
|
||||||
steps: [
|
steps: [
|
||||||
{
|
{
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
macos-scons: {
|
macos-scons: {
|
||||||
runs-on: macos-10.15,
|
runs-on: macos-12,
|
||||||
steps: [
|
steps: [
|
||||||
{
|
{
|
||||||
name: checkout,
|
name: checkout,
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ if platform == 'darwin':
|
|||||||
|
|
||||||
# pretty sketchy, but should point to your boost install
|
# pretty sketchy, but should point to your boost install
|
||||||
if subprocess.call(['which', '-s', 'brew']) == 0: # HomeBrew
|
if subprocess.call(['which', '-s', 'brew']) == 0: # HomeBrew
|
||||||
brew_boost_version = '1.58.0'
|
brew_boost_version = '1.85.0'
|
||||||
env.Append(
|
env.Append(
|
||||||
LIBPATH=['/usr/local/Cellar/boost/'+brew_boost_version+'/lib'],
|
LIBPATH=['/usr/local/Cellar/boost/'+brew_boost_version+'/lib'],
|
||||||
CPPPATH=['/usr/local/Cellar/boost/'+brew_boost_version+'/include'])
|
CPPPATH=['/usr/local/Cellar/boost/'+brew_boost_version+'/include'])
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace ResMgr {
|
namespace ResMgr {
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
|
|||||||
Reference in New Issue
Block a user