Skip to content

Commit

Permalink
more precise python version control in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
varunagrawal committed Jan 4, 2021
1 parent 7477f9e commit 8540b2c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/scripts/python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if [ -z ${PYTHON_VERSION+x} ]; then
exit 127
fi

PYTHON="python${PYTHON_VERSION}"
PYTHON="python${PYTHON_MAJOR_VERSION}"

if [[ $(uname) == "Darwin" ]]; then
brew install wget
Expand All @@ -66,7 +66,8 @@ mkdir $GITHUB_WORKSPACE/build
cd $GITHUB_WORKSPACE/build

cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release \
-DGTSAM_BUILD_TESTS=OFF -DGTSAM_BUILD_UNSTABLE=ON \
-DGTSAM_BUILD_TESTS=OFF \
-DGTSAM_BUILD_UNSTABLE=ON \
-DGTSAM_USE_QUATERNIONS=OFF \
-DGTSAM_WITH_TBB=${GTSAM_WITH_TBB:-OFF} \
-DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/build-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
CTEST_PARALLEL_LEVEL: 2
CMAKE_BUILD_TYPE: ${{ matrix.build_type }}
PYTHON_VERSION: ${{ matrix.python_version }}
PYTHON_MAJOR_VERSION: 3

strategy:
fail-fast: false
matrix:
Expand All @@ -26,32 +28,37 @@ jobs:
]

build_type: [Debug, Release]
python_version: [3]

include:
- name: ubuntu-18.04-gcc-5
os: ubuntu-18.04
compiler: gcc
version: "5"
python_version: 3.6.9

- name: ubuntu-18.04-gcc-9
os: ubuntu-18.04
compiler: gcc
version: "9"
python_version: 3.6.9

- name: ubuntu-18.04-clang-9
os: ubuntu-18.04
compiler: clang
version: "9"
python_version: 3.6.9

- name: macOS-10.15-xcode-11.3.1
os: macOS-10.15
compiler: xcode
version: "11.3.1"
python_version: 3.9.1

- name: ubuntu-18.04-gcc-5-tbb
os: ubuntu-18.04
compiler: gcc
version: "5"
python_version: 3.6.9
flag: tbb

steps:
Expand Down

0 comments on commit 8540b2c

Please sign in to comment.