update macos CI env
parent
e5c47b38ef
commit
31cfce0b8d
|
@ -19,16 +19,16 @@ jobs:
|
||||||
# Github Actions requires a single row to be added to the build matrix.
|
# Github Actions requires a single row to be added to the build matrix.
|
||||||
# See https://help.github.com/en/articles/workflow-syntax-for-github-actions.
|
# See https://help.github.com/en/articles/workflow-syntax-for-github-actions.
|
||||||
name: [
|
name: [
|
||||||
macOS-10.15-xcode-11.3.1,
|
macos-11-xcode-13.4.1,
|
||||||
]
|
]
|
||||||
|
|
||||||
build_type: [Debug, Release]
|
build_type: [Debug, Release]
|
||||||
build_unstable: [ON]
|
build_unstable: [ON]
|
||||||
include:
|
include:
|
||||||
- name: macOS-10.15-xcode-11.3.1
|
- name: macos-11-xcode-13.4.1
|
||||||
os: macOS-10.15
|
os: macos-11
|
||||||
compiler: xcode
|
compiler: xcode
|
||||||
version: "11.3.1"
|
version: "13.4.1"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
@ -43,7 +43,7 @@ jobs:
|
||||||
echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
|
echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
|
||||||
echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
|
echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
|
||||||
else
|
else
|
||||||
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
|
sudo xcode-select -switch /Applications/Xcode.app
|
||||||
echo "CC=clang" >> $GITHUB_ENV
|
echo "CC=clang" >> $GITHUB_ENV
|
||||||
echo "CXX=clang++" >> $GITHUB_ENV
|
echo "CXX=clang++" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
ubuntu-18.04-gcc-5,
|
ubuntu-18.04-gcc-5,
|
||||||
ubuntu-18.04-gcc-9,
|
ubuntu-18.04-gcc-9,
|
||||||
ubuntu-18.04-clang-9,
|
ubuntu-18.04-clang-9,
|
||||||
macOS-10.15-xcode-11.3.1,
|
macOS-11-xcode-13.4.1,
|
||||||
ubuntu-18.04-gcc-5-tbb,
|
ubuntu-18.04-gcc-5-tbb,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -52,10 +52,10 @@ jobs:
|
||||||
build_type: Debug
|
build_type: Debug
|
||||||
python_version: "3"
|
python_version: "3"
|
||||||
|
|
||||||
- name: macOS-10.15-xcode-11.3.1
|
- name: macOS-11-xcode-13.4.1
|
||||||
os: macOS-10.15
|
os: macOS-11
|
||||||
compiler: xcode
|
compiler: xcode
|
||||||
version: "11.3.1"
|
version: "13.4.1"
|
||||||
|
|
||||||
- name: ubuntu-18.04-gcc-5-tbb
|
- name: ubuntu-18.04-gcc-5-tbb
|
||||||
os: ubuntu-18.04
|
os: ubuntu-18.04
|
||||||
|
@ -103,7 +103,7 @@ jobs:
|
||||||
echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
|
echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
|
||||||
echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
|
echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
|
||||||
else
|
else
|
||||||
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
|
sudo xcode-select -switch /Applications/Xcode.app
|
||||||
echo "CC=clang" >> $GITHUB_ENV
|
echo "CC=clang" >> $GITHUB_ENV
|
||||||
echo "CXX=clang++" >> $GITHUB_ENV
|
echo "CXX=clang++" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue