Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-cpplib
Commits
47f2e3de
Commit
47f2e3de
authored
6 months ago
by
Joscha Schmiedt
Browse files
Options
Downloads
Patches
Plain Diff
PIPELINE: Update clang-format to clang-format-16
parent
1ec62b5e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!61
Release 0.3.0
,
!57
Fix deprecations + updates
Pipeline
#55336
failed
6 months ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.docker/Dockerfile
+3
-3
3 additions, 3 deletions
.docker/Dockerfile
Makefile
+1
-1
1 addition, 1 deletion
Makefile
with
4 additions
and
4 deletions
.docker/Dockerfile
+
3
−
3
View file @
47f2e3de
...
...
@@ -4,7 +4,7 @@ RUN apt-get update
RUN
apt-get
install
-y
cmake
RUN
apt-get
install
-y
lcov
RUN
apt-get
install
-y
doxygen graphviz
RUN
apt-get
install
-y
clang-format clang-tidy
RUN
apt-get
install
-y
clang-format
-16
clang-tidy
RUN
apt-get
install
-y
python3-pip python3-venv
RUN
apt-get
install
-y
git
RUN
apt-get
install
-y
curl zip unzip
tar
...
...
@@ -28,5 +28,5 @@ RUN git rev-parse HEAD > libcaosdb_commit
RUN
rm
-rf
.git
# build dependencies
RUN
/venv/bin/conan
install
/libcaosdb
--build
=
missing
-s
build_type
=
Debug
RUN
/venv/bin/conan
install
/libcaosdb
--build
=
missing
-s
build_type
=
Release
#
RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Debug
#
RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Release
This diff is collapsed.
Click to expand it.
Makefile
+
1
−
1
View file @
47f2e3de
...
...
@@ -22,7 +22,7 @@
# This Makefile is a wrapper for several other scripts.
CLANG_FORMAT
?=
clang-format
CLANG_FORMAT
?=
clang-format
-16
CONAN_SETTINGS
=
"compiler.libcxx=libstdc++11"
# OS specific handling, with code by Ken Jackson and oHo,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment