Merge branch 'release/1.6.1'

Bam4d · Nov 23, 2022 · a8d490c · a8d490c
2 parents 498cfaa + 86ee84d
commit a8d490c
Show file tree

Hide file tree

Showing 8 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.6.0]
+ - Version [e.g. 1.6.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.18.0)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
-project(Griddly VERSION 1.6.0)
+project(Griddly VERSION 1.6.1)
 
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -73,19 +73,19 @@ jobs:
         ManyLinux_p37:
           PythonVersion: 3.7
           PyBin: cp37-cp37m
-          PLAT: manylinux2014_x86_64
+          PLAT: manylinux_2_28_x86_64
         ManyLinux_p38:
           PythonVersion: 3.8
           PyBin: cp38-cp38
-          PLAT: manylinux2014_x86_64
+          PLAT: manylinux_2_28_x86_64
         ManyLinux_p39:
           PythonVersion: 3.9
           PyBin: cp39-cp39
-          PLAT: manylinux2014_x86_64
+          PLAT: manylinux_2_28_x86_64
         ManyLinux_p310:
           PythonVersion: 3.10
           PyBin: cp310-cp310
-          PLAT: manylinux2014_x86_64
+          PLAT: manylinux_2_28_x86_64
     steps:
       - task: InstallSSHKey@0
         inputs:

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

diff --git a/compile_shaders.bat b/compile_shaders.bat
@@ -11,5 +11,5 @@ EXIT /B 0
 
 :compile_shaders_in_dir
 echo "Compiling shaders in %~1"
-glslc %~1\triangle-textured.frag -o %~1\triangle-textured.frag.spv
-glslc %~1\triangle-textured.vert -o %~1\triangle-textured.vert.spv
+%GLSLC_BIN% %~1\triangle-textured.frag -o %~1\triangle-textured.frag.spv
+%GLSLC_BIN% %~1\triangle-textured.vert -o %~1\triangle-textured.vert.spv
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.6.0'
+release = '1.6.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.6.0",
+  "version": "1.6.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.6.0",
+    version="1.6.1",
     author_email="[email protected]",
     description="Griddly Python Libraries",
     long_description=long_description,