From 71c1e1731e71bc050264a14147a098e82e389baf Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Sun, 12 Jun 2022 20:40:36 +0100 Subject: [PATCH] Fix the broken bash array to str process in the builder --- .gitignore | 2 +- .ignore_sanitize | 2 +- .pre-commit-config.yaml | 15 +++++++-------- builder | 10 +++++----- resources/museum/SUPPORTERS | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 2568d84..4b32b2e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ docs/spec.pdf .env .tex .pdf -docs/overall_picture.png \ No newline at end of file +docs/overall_picture.png diff --git a/.ignore_sanitize b/.ignore_sanitize index 5ec155e..c341617 100644 --- a/.ignore_sanitize +++ b/.ignore_sanitize @@ -1 +1 @@ -#leak:mlir::Region::emplaceBlock \ No newline at end of file +#leak:mlir::Region::emplaceBlock diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8ea1456..54cdc83 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ fail_fast: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.3.0 hooks: - id: check-added-large-files - id: check-symlinks @@ -20,17 +20,16 @@ repos: - id: trailing-whitespace - id: mixed-line-ending - repo: https://github.com/pocc/pre-commit-hooks - rev: master + rev: v1.3.5 hooks: - id: clang-format - - id: clang-tidy + #- id: clang-tidy - id: oclint - - id: uncrustify - id: cppcheck - - id: cpplint + args: ['--project=compile_commands.json'] + #- id: cpplint - id: include-what-you-use - - repo: git://github.com/detailyang/pre-commit-shell - rev: v1.0.6 + - repo: https://github.com/detailyang/pre-commit-shell + rev: 1.0.5 hooks: - id: shell-lint - args: [--format=json] diff --git a/builder b/builder index e85520f..0b08e52 100755 --- a/builder +++ b/builder @@ -39,7 +39,7 @@ set -e # ----------------------------------------------------------------------------- command=$1 -VERSION="0.4.0" +VERSION="0.5.0" # Serene subprojects. We use this array to run common tasks on all the projects # like running the test cases @@ -103,7 +103,7 @@ function popd_build() { function build-gen() { pushed_build info "Running: " - info "cmake -G Ninja " "${CMAKEARGS[@]}" "${CMAKEARGS[@]}" "\"$*\" \"$ROOT_DIR\"" + info "cmake -G Ninja ${CMAKEARGS[*]} ${CMAKEARGS[*]}" "\"$*\" \"$ROOT_DIR\"" cmake -G Ninja "${CMAKEARGS[@]}" "${CMAKEARGS_DEBUG[@]}" "$*" "$ROOT_DIR" popd_build } @@ -112,21 +112,21 @@ function build-gen() { function info() { if [ "$1" ] then - echo -e "[\033[01;32mINFO\033[00m]: $1" + echo -e "[\033[01;32mINFO\033[00m]: $*" fi } function error() { if [ "$1" ] then - echo -e "[\033[01;31mERR\033[00m]: $1" + echo -e "[\033[01;31mERR\033[00m]: $*" fi } function warn() { if [ "$1" ] then - echo -e "[\033[01;33mWARN\033[00m]: $1" + echo -e "[\033[01;33mWARN\033[00m]: $*" fi } diff --git a/resources/museum/SUPPORTERS b/resources/museum/SUPPORTERS index a8536fa..30f90ea 100644 --- a/resources/museum/SUPPORTERS +++ b/resources/museum/SUPPORTERS @@ -1 +1 @@ -Here is a list of all the generous people who has supported Serene so far: \ No newline at end of file +Here is a list of all the generous people who has supported Serene so far: