Skip to content
Snippets Groups Projects
Commit 88c2a947 authored by Boman Romain's avatar Boman Romain
Browse files

update docker image

parent e09a5540
No related branches found
No related tags found
1 merge request!7Update docker image to ubuntu 22.04
Pipeline #10966 passed with warnings
default: default:
image: rboman/waves-py3:2020.3 image: rboman/waves-py3:2022.0
before_script: before_script:
- source /opt/intel/mkl/bin/mklvars.sh intel64 - source /opt/intel/mkl/bin/mklvars.sh intel64
- source /opt/intel/tbb/bin/tbbvars.sh intel64 - source /opt/intel/tbb/bin/tbbvars.sh intel64
...@@ -19,7 +19,7 @@ format: ...@@ -19,7 +19,7 @@ format:
<<: *global_tag_def <<: *global_tag_def
stage: build stage: build
script: script:
- clang-format --version # we use clang-format-10 exclusively - clang-format --version # the use should use this version too!
- ./scripts/format_code.py - ./scripts/format_code.py
- mkdir -p patches - 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 - 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
......
...@@ -43,7 +43,7 @@ def main(): ...@@ -43,7 +43,7 @@ def main():
encs = {} encs = {}
for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'): for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'):
# print(f) # print(f)
cmd = ['clang-format-10', "-style=file", "-i", f] cmd = ['clang-format', "-style=file", "-i", f]
retcode = subprocess.call(cmd) retcode = subprocess.call(cmd)
if retcode != 0: if retcode != 0:
print(f'ERROR: retcode = {retcode}') print(f'ERROR: retcode = {retcode}')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment