From 88c2a947102657c9d759a526d526201d337d5dad Mon Sep 17 00:00:00 2001
From: Romain Boman <r.boman@uliege.be>
Date: Sat, 7 Jan 2023 11:04:54 +0100
Subject: [PATCH] update docker image
---
.gitlab-ci.yml | 4 ++--
scripts/format_code.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaee10c..162f5c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
default:
- image: rboman/waves-py3:2020.3
+ image: rboman/waves-py3:2022.0
before_script:
- source /opt/intel/mkl/bin/mklvars.sh intel64
- source /opt/intel/tbb/bin/tbbvars.sh intel64
@@ -19,7 +19,7 @@ format:
<<: *global_tag_def
stage: build
script:
- - clang-format --version # we use clang-format-10 exclusively
+ - clang-format --version # the use should use this version too!
- ./scripts/format_code.py
- mkdir -p patches
- if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi
diff --git a/scripts/format_code.py b/scripts/format_code.py
index 120dd5f..15e3afc 100755
--- a/scripts/format_code.py
+++ b/scripts/format_code.py
@@ -43,7 +43,7 @@ def main():
encs = {}
for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'):
# print(f)
- cmd = ['clang-format-10', "-style=file", "-i", f]
+ cmd = ['clang-format', "-style=file", "-i", f]
retcode = subprocess.call(cmd)
if retcode != 0:
print(f'ERROR: retcode = {retcode}')
--
GitLab