diff --git a/.github/workflows/deploy-on-release.yml b/.github/workflows/deploy-on-release.yml index 7d51ea28f0..ac6ca0624b 100644 --- a/.github/workflows/deploy-on-release.yml +++ b/.github/workflows/deploy-on-release.yml @@ -232,7 +232,7 @@ jobs: matrix: config: - { - name: "Windows Server 2019 MSVC Py38", deploy_libs: true, deploy_python: true, + name: "Windows Server 2019 MSVC Py38", deploy_libs: false, deploy_python: true, os: windows-2019, libxml2_dir: '-D "LibXml2_DIR=../usr/local/lib/cmake/libxml2-2.9.10/"', zlib_dir: '-D "ZLIB_DIR=../usr/local/lib/cmake/ZLIB/"', @@ -242,17 +242,17 @@ jobs: - { name: "Windows Server 2019 MSVC Py39", deploy_libs: false, deploy_python: true, os: windows-2019, - libxml2_dir: '-D "LibXml2_DIR=../usr/local/LibXml2/LibXml2/CMake/"', + libxml2_dir: '-D "LibXml2_DIR=.../usr/local/lib/cmake/libxml2-2.9.10/"', zlib_dir: '-D "ZLIB_DIR=../usr/local/ZLIB/ZLIB/CMake/"', build_type: "Release", cc: "gcc", cxx: "g++", python_version: 3.9 } - { - name: "Ubuntu 20.04 GCC Py38", deploy_libs: true, deploy_python: false, + name: "Ubuntu 20.04 GCC Py38", deploy_libs: false, deploy_python: false, os: ubuntu-20.04, container: ubuntu-latest, swig_executable: "-D SWIG_EXECUTABLE=/usr/local/bin/swig", build_type: "Release", cc: "gcc", cxx: "g++", python_version: 3.8 } - { - name: "macOS 10.15 Clang Py38", deploy_libs: true, deploy_python: true, + name: "macOS 10.15 Clang Py38", deploy_libs: false, deploy_python: true, os: macos-10.15, python_rpath: "/usr/local/opt/python/Frameworks/Python.framework/Versions/3.8/", build_type: "Release", cc: "clang", cxx: "clang++", python_version: 3.8 @@ -624,6 +624,7 @@ jobs: npm install mime - name: Upload libcellml.js + if: "!true" uses: actions/github-script@v3 env: DATA: ${{ steps.package-javascript.outputs.files }} diff --git a/CMakeLists.txt b/CMakeLists.txt index d7cf0bf0df..102ebc7bfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.10.2) set(PROJECT_NAME libCellML) set(PROJECT_URL https://libcellml.org) set(_PROJECT_VERSION 0.2.0) -set(PROJECT_DEVELOPER_VERSION -dev.16) +set(PROJECT_DEVELOPER_VERSION -dev.17) project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX) # Set policies that affect the build.