Merge branch 'hotfix/1.5.1'

Bam4d · Oct 4, 2022 · fb79d30 · fb79d30
2 parents a6b5969 + 34b0a75
commit fb79d30
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git 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.5.0]
+ - Version [e.g. 1.5.1]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.0)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
-project(Griddly VERSION 1.5.0)
+project(Griddly VERSION 1.5.1)
 
 set(BINARY ${CMAKE_PROJECT_NAME})
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,7 +14,7 @@ pr:
 
 jobs:
   - job: Linux
-    timeoutInMinutes: 40
+    timeoutInMinutes: 60
     pool:
       vmImage: "ubuntu-18.04"
     steps:
@@ -73,7 +73,7 @@ jobs:
   - job: PyPiDeployLinux
     dependsOn: Linux
     condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), contains(variables['Build.SourceBranch'], 'test_deploy')))
-    timeoutInMinutes: 40
+    timeoutInMinutes: 60
     pool:
       vmImage: "ubuntu-18.04"
     strategy:
@@ -136,7 +136,7 @@ jobs:
   - job: Windows
     variables:
       VULKAN_SDK: C:/VulkanSDK/1.2.148.0
-    timeoutInMinutes: 40
+    timeoutInMinutes: 60
     pool:
       vmImage: "windows-latest"
     steps:
@@ -201,7 +201,7 @@ jobs:
     dependsOn: Windows
     variables:
       VULKAN_SDK: C:/VulkanSDK/1.2.148.0
-    timeoutInMinutes: 40
+    timeoutInMinutes: 60
     pool:
       vmImage: "windows-latest"
     strategy:
@@ -268,7 +268,7 @@ jobs:
         displayName: Deploy To PyPi
 
   - job: MacOS
-    timeoutInMinutes: 40
+    timeoutInMinutes: 60
     pool:
       vmImage: "macOS-latest"
     steps:
@@ -327,7 +327,7 @@ jobs:
   - job: PyPiDeployMacOS
     condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), contains(variables['Build.SourceBranch'], 'test_deploy')))
     dependsOn: MacOS
-    timeoutInMinutes: 40
+    timeoutInMinutes: 60
     pool:
       vmImage: "macOS-latest"
     strategy:

diff --git 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.5.0";
+  m.attr("version") = "1.5.1";
 
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);

diff --git 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.5.0'
+release = '1.5.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/js/griddlyjs-app/package.json b/js/griddlyjs-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "griddlyjs-app",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.1",

diff --git a/python/setup.py b/python/setup.py
@@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'):
 
 setup(
     name='griddly',
-    version="1.5.0",
+    version="1.5.1",
     author_email="chrisbam4d@gmail.com",
     description="Griddly Python Libraries",
     long_description=long_description,