Skip to content

Commit 103041a

Browse files
committed
Merge branch 'version-1.1' into 'develop'
Version bump 1.1 See merge request educelab/OpenABF!11
2 parents 8b8c7cf + 7d85a28 commit 103041a

File tree

5 files changed

+23
-9
lines changed

5 files changed

+23
-9
lines changed

.gitlab-ci.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,22 @@ test:cpp14:debian:10:
3333
tags:
3434
- docker
3535

36+
test:cpp14:debian:11:
37+
extends: test:cpp14:debian:10
38+
image: ghcr.io/educelab/ci-docker:11_v2.static
39+
3640
test:cpp17:debian:10:
3741
extends: test:cpp14:debian:10
3842
variables:
3943
EXTRA_CMAKE_FLAGS: "-DOPENABF_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=17"
4044

45+
test:cpp17:debian:11:
46+
extends: test:cpp17:debian:10
47+
image: ghcr.io/educelab/ci-docker:11_v2.static
48+
4149
single_header_updated:
4250
needs: []
43-
image: python:3.8
51+
image: python:3.11
4452
script:
4553
- python3 thirdparty/amalgamate/amalgamate.py -c single_include.json -s .
4654
- changed=$(git diff --stat)
@@ -57,14 +65,22 @@ examples:debian:10:
5765
tags:
5866
- docker
5967

68+
examples:debian:11:
69+
extends: .build
70+
needs: []
71+
image: ghcr.io/educelab/ci-docker:11_v2.static
72+
variables:
73+
EXTRA_CMAKE_FLAGS: "-DOPENABF_BUILD_EXAMPLES=ON"
74+
tags:
75+
- docker
76+
6077
### Docs ###
6178
pages:
6279
needs: []
63-
image: debian:buster-backports
80+
image: debian:bullseye-backports
6481
before_script:
6582
- apt-get update
66-
- apt-get install -y build-essential doxygen graphviz texlive ghostscript
67-
- apt-get -t buster-backports install -y cmake libeigen3-dev
83+
- apt-get install -y build-essential doxygen graphviz texlive ghostscript cmake libeigen3-dev
6884
script:
6985
- mkdir -p build/
7086
- mkdir -p public/

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
2-
project(OpenABF VERSION 1.0)
2+
project(OpenABF VERSION 1.1)
33

44
# Setup project directories
55
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2021 EduceLab
189+
Copyright 2023 EduceLab
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OpenABF (https://gitlab.com/educelab/OpenABF)
2-
Copyright 2021 EduceLab
2+
Copyright 2023 EduceLab
33

44
This product includes software developed at
55
EduceLab, University of Kentucky (https://www.cs.uky.edu/dri/)

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
The templated interface is designed for simple out-of-the-box use, and
55
integration with existing geometric processing pipelines is quick and easy.
66

7-
[[_TOC_]]
8-
97
## Dependencies
108
- C++14 compiler
119
- [Eigen 3.3+](http://eigen.tuxfamily.org/)

0 commit comments

Comments
 (0)