From e502eeee2fffd9d06a57bf4d21072a4e73fa9c0f Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Mon, 26 Jul 2021 16:59:43 +0200 Subject: [PATCH] test with Ubuntu 20.04, fix occ versions compatibility --- .gitlab-ci.yml | 2 +- libsrc/occ/python_occ.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5ad6f13..1b3ddbad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ cleanup_win: - ls - docker info variables: - UBUNTU_VERSION: "18.04" + UBUNTU_VERSION: "20.04" build_ubuntu_debug: <<: *ubuntu diff --git a/libsrc/occ/python_occ.cpp b/libsrc/occ/python_occ.cpp index d63b7412..e8f29160 100644 --- a/libsrc/occ/python_occ.cpp +++ b/libsrc/occ/python_occ.cpp @@ -20,7 +20,7 @@ #include #include -#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=2 +#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=4 #define OCC_HAVE_HISTORY #endif