From e562b54b5232a63cd1e08763fd67034c3b048b70 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Sat, 31 Dec 2022 20:21:36 +0000 Subject: [PATCH 1/4] test deployment on all platforms --- azure-pipelines.yml | 10 +++-- cmake/settings/Conan.cmake | 64 -------------------------------- python/manylinux/build-wheels.sh | 5 ++- 3 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 cmake/settings/Conan.cmake diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 786c9fff8..edfa5dd3f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -268,8 +268,9 @@ jobs: displayName: Install Conan - bash: | set -ex - cmake . -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR:STRING="$(py.pythonLocation)" - cmake --build . --target python_griddly --config Release + conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build missing -if build + cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DPython_ROOT_DIR:STRING="$(py.pythonLocation)" + cmake --build build --config Release displayName: Build - script: | cd python @@ -382,8 +383,9 @@ jobs: displayName: Install Conan - bash: | set -ex - cmake . -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR:STRING=$(py.pythonLocation) - cmake --build . --config Release + conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build missing -if build + cmake . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DPython_ROOT_DIR:STRING="$(py.pythonLocation)" + cmake --build build --config Release displayName: Build - script: | cd python diff --git a/cmake/settings/Conan.cmake b/cmake/settings/Conan.cmake deleted file mode 100644 index dd75c79bc..000000000 --- a/cmake/settings/Conan.cmake +++ /dev/null @@ -1,64 +0,0 @@ -macro(run_conan) - if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") - message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" - "${CMAKE_BINARY_DIR}/conan.cmake" - TLS_VERIFY ON) - endif() - - include(${CMAKE_BINARY_DIR}/conan.cmake) - - # Create a conan profile for building WASM with Emscripten - if(WASM) - set(REQUIREMENTS - glm/0.9.9.8 - yaml-cpp/0.6.3 - spdlog/1.9.2) - - set(BUILD_PROFILE_HOST emsdk) - else() - set(REQUIREMENTS - gtest/1.11.0 - shaderc/2021.1 - pybind11/2.10.0 - glm/0.9.9.8 - yaml-cpp/0.6.3 - spdlog/1.9.2 - stb/20200203 - volk/1.3.224.1) - set(BUILD_PROFILE_HOST default) - endif() - - set(CONAN_DISABLE_CHECK_COMPILER on) - - if(MANYLINUX) - set(BUILD_COMPILE_OPTION all) - else() - set(BUILD_COMPILE_OPTION missing) - endif() - - conan_cmake_configure( - REQUIRES - ${REQUIREMENTS} - OPTIONS - gtest:build_gmock=True - GENERATORS - cmake_find_package - cmake_paths - CMakeToolchain - ) - - conan_cmake_autodetect(settings) - - conan_cmake_install( - PATH_OR_REFERENCE . - CONAN_COMMAND ${CONAN} - ${CONAN_EXTRA_REQUIRES} - OPTIONS - ${CONAN_EXTRA_OPTIONS} - PROFILE_HOST ${BUILD_PROFILE_HOST} - PROFILE_BUILD default - BUILD ${BUILD_COMPILE_OPTION} - SETTINGS ${settings} - ) -endmacro() diff --git a/python/manylinux/build-wheels.sh b/python/manylinux/build-wheels.sh index 4cb3bdbbb..1abcac2f8 100755 --- a/python/manylinux/build-wheels.sh +++ b/python/manylinux/build-wheels.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -ex set -o pipefail @@ -19,7 +19,8 @@ echo "Conan Build Finished" # # Cmake Build Griddly cd /opt/Griddly -/opt/python/$PYBIN/bin/cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DMANYLINUX=ON -DPython_ROOT_DIR:STRING=/opt/python/$PYBIN -DPYTHON_EXECUTABLE:FILEPATH=/opt/python/$PYBIN/bin/python -S /opt/Griddly -B /opt/Griddly/build_manylinux +conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build=* -if build_manylinux +/opt/python/$PYBIN/bin/cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR:STRING=/opt/python/$PYBIN -DPYTHON_EXECUTABLE:FILEPATH=/opt/python/$PYBIN/bin/python -S /opt/Griddly -B /opt/Griddly/build_manylinux /opt/python/$PYBIN/bin/cmake --build /opt/Griddly/build_manylinux --target python_griddly # # # Create Wheel From f136beadbb9329713c1f3f23f0bb6f14bc2604f6 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Sat, 31 Dec 2022 20:33:48 +0000 Subject: [PATCH 2/4] don't call Conan.cmake anymore --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 875ec4245..7b7548d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,6 @@ enable_sanitizers(project_options) # allow for static analysis include(${CMAKE_CONFIG_FOLDER}/settings/StaticAnalyzers.cmake) -include(${CMAKE_CONFIG_FOLDER}/settings/Conan.cmake) - # glm find_package(glm REQUIRED) From abfb3ca933ca6975b7b00488694c5ce356303893 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Sat, 31 Dec 2022 21:21:10 +0000 Subject: [PATCH 3/4] another attempt --- python/manylinux/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/manylinux/build-wheels.sh b/python/manylinux/build-wheels.sh index 1abcac2f8..0b01baa16 100755 --- a/python/manylinux/build-wheels.sh +++ b/python/manylinux/build-wheels.sh @@ -20,7 +20,7 @@ echo "Conan Build Finished" # # Cmake Build Griddly cd /opt/Griddly conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build=* -if build_manylinux -/opt/python/$PYBIN/bin/cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR:STRING=/opt/python/$PYBIN -DPYTHON_EXECUTABLE:FILEPATH=/opt/python/$PYBIN/bin/python -S /opt/Griddly -B /opt/Griddly/build_manylinux +/opt/python/$PYBIN/bin/cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DPython_ROOT_DIR:STRING=/opt/python/$PYBIN -DPYTHON_EXECUTABLE:FILEPATH=/opt/python/$PYBIN/bin/python -S /opt/Griddly -B /opt/Griddly/build_manylinux /opt/python/$PYBIN/bin/cmake --build /opt/Griddly/build_manylinux --target python_griddly # # # Create Wheel From d9fb307f12968e332c9d940ab4a3b74917a9411b Mon Sep 17 00:00:00 2001 From: Bam4d Date: Mon, 2 Jan 2023 18:31:16 +0000 Subject: [PATCH 4/4] bumping version numbers --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- bindings/python.cpp | 2 +- docs/conf.py | 2 +- js/griddlyjs-app/package-lock.json | 2 +- js/griddlyjs-app/package.json | 2 +- python/setup.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b925a1fc0..f6e3f4f10 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - OS: [e.g. mac/linux/windows] - - Version [e.g. 1.6.4] + - Version [e.g. 1.6.5] **Additional context** Add any other context about the problem here. diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b7548d31..a1ace72cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.18.0) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") -project(Griddly VERSION 1.6.4) +project(Griddly VERSION 1.6.5) string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) diff --git a/bindings/python.cpp b/bindings/python.cpp index 83c7b2969..76617d025 100644 --- a/bindings/python.cpp +++ b/bindings/python.cpp @@ -12,7 +12,7 @@ namespace griddly { PYBIND11_MODULE(python_griddly, m) { m.doc() = "Griddly python bindings"; - m.attr("version") = "1.6.4"; + m.attr("version") = "1.6.5"; #ifndef NDEBUG spdlog::set_level(spdlog::level::debug); diff --git a/docs/conf.py b/docs/conf.py index 02baa7533..2a1825be9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ author = 'Chris Bamford' # The full version, including alpha/beta/rc tags -release = '1.6.4' +release = '1.6.5' # -- General configuration --------------------------------------------------- diff --git a/js/griddlyjs-app/package-lock.json b/js/griddlyjs-app/package-lock.json index dbaccf1ae..8efe9507d 100644 --- a/js/griddlyjs-app/package-lock.json +++ b/js/griddlyjs-app/package-lock.json @@ -1,6 +1,6 @@ { "name": "griddlyjs-app", - "version": "1.6.4", + "version": "1.6.5", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/js/griddlyjs-app/package.json b/js/griddlyjs-app/package.json index fd6873850..82d0eb323 100644 --- a/js/griddlyjs-app/package.json +++ b/js/griddlyjs-app/package.json @@ -1,6 +1,6 @@ { "name": "griddlyjs-app", - "version": "1.6.4", + "version": "1.6.5", "private": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.1", diff --git a/python/setup.py b/python/setup.py index a5c2dde2a..cbc8e60b7 100644 --- a/python/setup.py +++ b/python/setup.py @@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'): setup( name='griddly', - version="1.6.4", + version="1.6.5", author_email="chrisbam4d@gmail.com", description="Griddly Python Libraries", long_description=long_description,