From 025be523468c5d8533f91e3fc650e15953088e88 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Mon, 15 Nov 2021 15:05:34 +0000 Subject: [PATCH 1/4] remove the warning for releasing env resources --- src/Griddly/Core/GameProcess.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Griddly/Core/GameProcess.cpp b/src/Griddly/Core/GameProcess.cpp index 97d4f9f2b..bc3d3f036 100644 --- a/src/Griddly/Core/GameProcess.cpp +++ b/src/Griddly/Core/GameProcess.cpp @@ -189,7 +189,7 @@ ObserverConfig GameProcess::getObserverConfig(ObserverType observerType) const { } void GameProcess::release() { - spdlog::warn("Forcing release of vulkan"); + spdlog::debug("Forcing release of vulkan"); observer_->release(); for (auto& p : players_) { p->getObserver()->release(); From 688d2aaa5e181011ce23d7f3052e8befc136b5d2 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Mon, 15 Nov 2021 16:58:04 +0000 Subject: [PATCH 2/4] give macos more time --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f39d07c27..b43725e59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -263,7 +263,7 @@ jobs: displayName: Deploy To PyPi - job: MacOS - timeoutInMinutes: 30 + timeoutInMinutes: 40 pool: vmImage: "macOS-latest" steps: @@ -322,7 +322,7 @@ jobs: - job: PyPiDeployMacOS condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), contains(variables['Build.SourceBranch'], 'test_deploy'))) dependsOn: MacOS - timeoutInMinutes: 30 + timeoutInMinutes: 40 pool: vmImage: "macOS-latest" strategy: From d77de6e22c7df96408c85a3d507b48fda9c41c50 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Mon, 15 Nov 2021 20:21:25 +0000 Subject: [PATCH 3/4] bumping version numbers --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- bindings/python.cpp | 2 +- docs/conf.py | 2 +- python/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 14117b86d..5c56283a4 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.2.13] + - Version [e.g. 1.2.14] **Additional context** Add any other context about the problem here. diff --git a/CMakeLists.txt b/CMakeLists.txt index 96cc0eb57..8da86ff7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.0) -project(Griddly VERSION 1.2.13) +project(Griddly VERSION 1.2.14) set(BINARY ${CMAKE_PROJECT_NAME}) diff --git a/bindings/python.cpp b/bindings/python.cpp index c07ed6652..5661fd42a 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.2.13"; + m.attr("version") = "1.2.14"; #ifndef NDEBUG spdlog::set_level(spdlog::level::debug); diff --git a/docs/conf.py b/docs/conf.py index a05d722fe..b04233283 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.2.13' +release = '1.2.14' # -- General configuration --------------------------------------------------- diff --git a/python/setup.py b/python/setup.py index e18fbdc75..3e7da18ba 100644 --- a/python/setup.py +++ b/python/setup.py @@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'): setup( name='griddly', - version="1.2.13", + version="1.2.14", author_email="chrisbam4d@gmail.com", description="Griddly Python Libraries", long_description=long_description, From 59483b7b63e662720b5b33d8a2ca22db8c59609e Mon Sep 17 00:00:00 2001 From: Bam4d Date: Mon, 15 Nov 2021 21:00:27 +0000 Subject: [PATCH 4/4] master -> main --- tests/vendor/CMakeLists.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vendor/CMakeLists.txt.in b/tests/vendor/CMakeLists.txt.in index 4e1524ce7..6599508e1 100644 --- a/tests/vendor/CMakeLists.txt.in +++ b/tests/vendor/CMakeLists.txt.in @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master + GIT_TAG main SOURCE_DIR "${GOOGLE_TEST_DIR}/googletest-src" BINARY_DIR "${GOOGLE_TEST_DIR}/googletest-build" CONFIGURE_COMMAND ""