Skip to content

Commit a8d490c

Browse files
committed
Merge branch 'release/1.6.1'
2 parents 498cfaa + 86ee84d commit a8d490c

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
2424

2525
**Desktop (please complete the following information):**
2626
- OS: [e.g. mac/linux/windows]
27-
- Version [e.g. 1.6.0]
27+
- Version [e.g. 1.6.1]
2828

2929
**Additional context**
3030
Add any other context about the problem here.

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.18.0)
22
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
3-
project(Griddly VERSION 1.6.0)
3+
project(Griddly VERSION 1.6.1)
44

55
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
66

azure-pipelines.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ jobs:
7373
ManyLinux_p37:
7474
PythonVersion: 3.7
7575
PyBin: cp37-cp37m
76-
PLAT: manylinux2014_x86_64
76+
PLAT: manylinux_2_28_x86_64
7777
ManyLinux_p38:
7878
PythonVersion: 3.8
7979
PyBin: cp38-cp38
80-
PLAT: manylinux2014_x86_64
80+
PLAT: manylinux_2_28_x86_64
8181
ManyLinux_p39:
8282
PythonVersion: 3.9
8383
PyBin: cp39-cp39
84-
PLAT: manylinux2014_x86_64
84+
PLAT: manylinux_2_28_x86_64
8585
ManyLinux_p310:
8686
PythonVersion: 3.10
8787
PyBin: cp310-cp310
88-
PLAT: manylinux2014_x86_64
88+
PLAT: manylinux_2_28_x86_64
8989
steps:
9090
- task: InstallSSHKey@0
9191
inputs:

bindings/python.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace griddly {
1212

1313
PYBIND11_MODULE(python_griddly, m) {
1414
m.doc() = "Griddly python bindings";
15-
m.attr("version") = "1.6.0";
15+
m.attr("version") = "1.6.1";
1616

1717
#ifndef NDEBUG
1818
spdlog::set_level(spdlog::level::debug);

compile_shaders.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ EXIT /B 0
1111

1212
:compile_shaders_in_dir
1313
echo "Compiling shaders in %~1"
14-
glslc %~1\triangle-textured.frag -o %~1\triangle-textured.frag.spv
15-
glslc %~1\triangle-textured.vert -o %~1\triangle-textured.vert.spv
14+
%GLSLC_BIN% %~1\triangle-textured.frag -o %~1\triangle-textured.frag.spv
15+
%GLSLC_BIN% %~1\triangle-textured.vert -o %~1\triangle-textured.vert.spv

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Chris Bamford'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '1.6.0'
25+
release = '1.6.1'
2626

2727

2828
# -- General configuration ---------------------------------------------------

js/griddlyjs-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "griddlyjs-app",
3-
"version": "1.6.0",
3+
"version": "1.6.1",
44
"private": true,
55
"dependencies": {
66
"@fortawesome/fontawesome-svg-core": "^6.1.1",

python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'):
7171

7272
setup(
7373
name='griddly',
74-
version="1.6.0",
74+
version="1.6.1",
7575
author_email="chrisbam4d@gmail.com",
7676
description="Griddly Python Libraries",
7777
long_description=long_description,

0 commit comments

Comments
 (0)