Merge pull request #676 from johnmcfarlane/fix-conan-profile-in-deplo…

…y.sh Fix Conan profile in deploy script
johnmcfarlane · Dec 27, 2020 · 4d44556 · 4d44556
2 parents ae38c7d + 1d0ee4c
commit 4d44556
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 32 deletions.
diff --git a/.github/deploy.sh → .github/deploy b/.github/deploy.sh → .github/deploy
@@ -22,7 +22,7 @@ else
 fi
 
 # Generate documentation
-"${PROJECT_DIR}/doc/generate.sh"
+"${PROJECT_DIR}/doc/generate"
 
 # Push revision of documentation
 pushd "${PROJECT_DIR}/doc/gh-pages"
@@ -39,7 +39,7 @@ fi
 popd
 
 # Upload new version of CNL Conan package to Bintray
-conan remote add --force johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl
+"${PROJECT_DIR}/test/scripts/conan-setup"
 conan user -p "${CONAN_PASS}" -r johnmcfarlane/cnl "${CONAN_USER}"
 conan install --build=missing "${PROJECT_DIR}"
 conan create "${PROJECT_DIR}" "cnl/${CNL_VERSION}@johnmcfarlane/development"

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,4 +22,4 @@ jobs:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         CONAN_PASS: ${{secrets.BINTRAY_API_KEY}}
         CONAN_USER: ${{secrets.BINTRAY_USERNAME}}
-      run: CNL_VERSION_TAG=$GITHUB_REF $GITHUB_WORKSPACE/.github/deploy.sh
+      run: CNL_VERSION_TAG=$GITHUB_REF $GITHUB_WORKSPACE/.github/deploy
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -331,7 +331,7 @@ jobs:
 
     - name: Run All Tests
       shell: bash
-      run: $GITHUB_WORKSPACE/test/scripts/shellcheck.sh
+      run: $GITHUB_WORKSPACE/test/scripts/shellcheck
 
   # Test documentation generation
   doxygen:
@@ -345,7 +345,7 @@ jobs:
 
     - name: Generate documentation
       shell: bash
-      run: $GITHUB_WORKSPACE/doc/generate.sh
+      run: $GITHUB_WORKSPACE/doc/generate
 
     - name: Upload documentation
       uses: actions/upload-artifact@v2

diff --git a/doc/generate.sh → doc/generate b/doc/generate.sh → doc/generate
diff --git a/test/scripts/benchmark.sh → test/scripts/benchmark b/test/scripts/benchmark.sh → test/scripts/benchmark
diff --git a/test/scripts/clang-tidy.sh → test/scripts/clang-tidy b/test/scripts/clang-tidy.sh → test/scripts/clang-tidy
@@ -10,6 +10,6 @@ PROJECT_DIR=$(
   pwd
 )
 
-"${PROJECT_DIR}/test/scripts/test.sh" \
+"${PROJECT_DIR}/test/scripts/test" \
   --env CONAN_CMAKE_TOOLCHAIN_FILE="${PROJECT_DIR}/test/cmake/toolchain/clang-tidy-libc++.cmake" \
   --env CXX=clang++
diff --git a/test/scripts/conan-setup.sh → test/scripts/conan-setup b/test/scripts/conan-setup.sh → test/scripts/conan-setup
diff --git a/test/scripts/sanitize-clang.sh → test/scripts/sanitize-clang b/test/scripts/sanitize-clang.sh → test/scripts/sanitize-clang
@@ -9,7 +9,7 @@ PROJECT_DIR=$(
   pwd
 )
 
-"${PROJECT_DIR}/test/scripts/test.sh" \
+"${PROJECT_DIR}/test/scripts/test" \
   --env CONAN_CMAKE_TOOLCHAIN_FILE="${PROJECT_DIR}/test/cmake/toolchain/clang.cmake" \
   --env CXX=clang++ \
   --env LSAN_OPTIONS=verbosity=1:log_threads=1 \

diff --git a/test/scripts/sanitize-gcc.sh → test/scripts/sanitize-gcc b/test/scripts/sanitize-gcc.sh → test/scripts/sanitize-gcc
@@ -9,7 +9,7 @@ PROJECT_DIR=$(
   pwd
 )
 
-"${PROJECT_DIR}/test/scripts/test.sh" \
+"${PROJECT_DIR}/test/scripts/test" \
   --env CONAN_CMAKE_TOOLCHAIN_FILE="${PROJECT_DIR}/test/cmake/toolchain/gcc.cmake" \
   --env CXX=g++ \
   --env LSAN_OPTIONS=verbosity=1:log_threads=1 \

diff --git a/test/scripts/shellcheck b/test/scripts/shellcheck
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# Configure, build and run ShellCheck shell script linter over all scripts in project directory
+
+set -euo pipefail
+
+PROJECT_DIR=$(
+  cd "$(dirname "$0")"/../..
+  pwd
+)
+
+cd "${PROJECT_DIR}"
+
+git ls-files | while read -r file
+do
+  if [[ -f "$file" && -x "$file" && "$(head --lines 1 "$file")" == "#!/usr/bin/env bash" ]]
+  then
+    shellcheck \
+        --check-sourced \
+        --color=always \
+        --external-sources \
+        --severity=info \
+        --shell=bash \
+        "$file"
+    printf "OK: %s\n" "$file"
+  fi
+done
+
+echo shellcheck success
diff --git a/test/scripts/shellcheck.sh b/test/scripts/shellcheck.sh
diff --git a/test/scripts/test.sh → test/scripts/test b/test/scripts/test.sh → test/scripts/test
diff --git a/test/scripts/test-all.sh → test/scripts/test-all b/test/scripts/test-all.sh → test/scripts/test-all
@@ -9,5 +9,5 @@ PROJECT_DIR=$(
   pwd
 )
 
-"${PROJECT_DIR}"/test/scripts/test.sh \
+"${PROJECT_DIR}"/test/scripts/test \
   --options target=test-all
diff --git a/test/scripts/unit-test.sh → test/scripts/unit-test b/test/scripts/unit-test.sh → test/scripts/unit-test
@@ -9,5 +9,5 @@ PROJECT_DIR=$(
   pwd
 )
 
-"${PROJECT_DIR}/test/scripts/test.sh" \
+"${PROJECT_DIR}/test/scripts/test" \
   --options target=test-unit