From bef792dc7f86d6cdc0b3395826e34efa8febb886 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 23 Nov 2022 21:40:24 +0000 Subject: [PATCH 1/3] use latest manylinux so shaders compile ok --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b5d2b9265..f04576d47 100644 --- 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: From 5708f16bf3b98ea828f7c38dfbb50e8f6eacd4c3 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 23 Nov 2022 21:44:03 +0000 Subject: [PATCH 2/3] get windows to use the correct glslc location --- compile_shaders.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compile_shaders.bat b/compile_shaders.bat index 88f6cddea..07ac423a2 100644 --- 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 From 86ee84dd97499990ca8f19322b9fd864568d054d Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 23 Nov 2022 22:55:43 +0000 Subject: [PATCH 3/3] 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.json | 2 +- python/setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e841a212d..11f93dcb5 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.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 index bcff33100..9b3cc49bc 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.0) +project(Griddly VERSION 1.6.1) string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) diff --git a/bindings/python.cpp b/bindings/python.cpp index f19f7ff49..060b153a5 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.0"; + m.attr("version") = "1.6.1"; #ifndef NDEBUG spdlog::set_level(spdlog::level::debug); diff --git a/docs/conf.py b/docs/conf.py index 89d8b455d..1b88ac720 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.0' +release = '1.6.1' # -- General configuration --------------------------------------------------- diff --git a/js/griddlyjs-app/package.json b/js/griddlyjs-app/package.json index 56bd334dc..07110e47e 100644 --- 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 index 0a3c343df..bbfad7fa0 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.0", + version="1.6.1", author_email="chrisbam4d@gmail.com", description="Griddly Python Libraries", long_description=long_description,