Skip to content

Commit 34ded93

Browse files
committed
Merge branch 'master' into clang22
2 parents 7b3c404 + 222fa8b commit 34ded93

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

script/auto_format.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
#!/usr/bin/env bash
2+
3+
set -e
4+
25
(find api_search -name "*.cpp" && find include -name "*.hpp" && find examples -name "*.cpp" && find test -name "*.cpp") | xargs clang-format -i {}

script/ci.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -e
4+
35
# Central script called by the CI
46
# Usage:
57
# ci.sh {run_build|run_tests}
@@ -17,7 +19,7 @@ if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
1719
# Windows path handling is a never ending source of ...
1820
INSTALL_PREFIX="$USERPROFILE\\.local"
1921
INSTALL_PREFIX=$(cygpath -u "$INSTALL_PREFIX") # Make CMake happy when using git bash under windows
20-
export CMAKE_PREFIX_PATH=$INSTALL_PREFIX;$CMAKE_PREFIX_PATH # Notice the ";" instead of ":"
22+
export CMAKE_PREFIX_PATH="${INSTALL_PREFIX}${CMAKE_PREFIX_PATH:+;${CMAKE_PREFIX_PATH}}" # Notice the ";" instead of ":"
2123
else
2224
INSTALL_PREFIX="$HOME/.local"
2325
export CMAKE_PREFIX_PATH=$INSTALL_PREFIX:$CMAKE_PREFIX_PATH

script/ci_setup_linux.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
22

3+
set -e
4+
35
apt-get update
46
apt-get install -y git

0 commit comments

Comments
 (0)