12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "more precise python version control in CI" 

This reverts commit 8540b2c07d.
release/4.3a0
Varun Agrawal 2021-01-04 13:26:34 -05:00
parent 8540b2c07d
commit 569311d49c
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/scripts/python.sh vendored
View File

@ -43,7 +43,7 @@ if [ -z ${PYTHON_VERSION+x} ]; then
exit 127 exit 127
fi fi
PYTHON="python${PYTHON_MAJOR_VERSION}" PYTHON="python${PYTHON_VERSION}"
if [[ $(uname) == "Darwin" ]]; then if [[ $(uname) == "Darwin" ]]; then
brew install wget brew install wget
@ -66,8 +66,7 @@ mkdir $GITHUB_WORKSPACE/build
cd $GITHUB_WORKSPACE/build cd $GITHUB_WORKSPACE/build
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release \ cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release \
-DGTSAM_BUILD_TESTS=OFF \ -DGTSAM_BUILD_TESTS=OFF -DGTSAM_BUILD_UNSTABLE=ON \
-DGTSAM_BUILD_UNSTABLE=ON \
-DGTSAM_USE_QUATERNIONS=OFF \ -DGTSAM_USE_QUATERNIONS=OFF \
-DGTSAM_WITH_TBB=${GTSAM_WITH_TBB:-OFF} \ -DGTSAM_WITH_TBB=${GTSAM_WITH_TBB:-OFF} \
-DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \

9
.github/workflows/build-python.yml vendored
View File

@ -12,8 +12,6 @@ jobs:
CTEST_PARALLEL_LEVEL: 2 CTEST_PARALLEL_LEVEL: 2
CMAKE_BUILD_TYPE: ${{ matrix.build_type }} CMAKE_BUILD_TYPE: ${{ matrix.build_type }}
PYTHON_VERSION: ${{ matrix.python_version }} PYTHON_VERSION: ${{ matrix.python_version }}
PYTHON_MAJOR_VERSION: 3
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -28,37 +26,32 @@ jobs:
] ]
build_type: [Debug, Release] build_type: [Debug, Release]
python_version: [3]
include: include:
- name: ubuntu-18.04-gcc-5 - name: ubuntu-18.04-gcc-5
os: ubuntu-18.04 os: ubuntu-18.04
compiler: gcc compiler: gcc
version: "5" version: "5"
python_version: 3.6.9
- name: ubuntu-18.04-gcc-9 - name: ubuntu-18.04-gcc-9
os: ubuntu-18.04 os: ubuntu-18.04
compiler: gcc compiler: gcc
version: "9" version: "9"
python_version: 3.6.9
- name: ubuntu-18.04-clang-9 - name: ubuntu-18.04-clang-9
os: ubuntu-18.04 os: ubuntu-18.04
compiler: clang compiler: clang
version: "9" version: "9"
python_version: 3.6.9
- name: macOS-10.15-xcode-11.3.1 - name: macOS-10.15-xcode-11.3.1
os: macOS-10.15 os: macOS-10.15
compiler: xcode compiler: xcode
version: "11.3.1" version: "11.3.1"
python_version: 3.9.1
- name: ubuntu-18.04-gcc-5-tbb - name: ubuntu-18.04-gcc-5-tbb
os: ubuntu-18.04 os: ubuntu-18.04
compiler: gcc compiler: gcc
version: "5" version: "5"
python_version: 3.6.9
flag: tbb flag: tbb
steps: steps: