diff --git a/Framework/.clang-format b/.clang-format similarity index 100% rename from Framework/.clang-format rename to .clang-format diff --git a/Framework/.github/format-check b/.github/format-check similarity index 100% rename from Framework/.github/format-check rename to .github/format-check diff --git a/Framework/.github/workflows/format-check.yml b/.github/workflows/format-check.yml similarity index 100% rename from Framework/.github/workflows/format-check.yml rename to .github/workflows/format-check.yml diff --git a/SimCore/.clang-format b/SimCore/.clang-format deleted file mode 100644 index 9f3e95ce0..000000000 --- a/SimCore/.clang-format +++ /dev/null @@ -1,2 +0,0 @@ ---- -BasedOnStyle: Google diff --git a/SimCore/.github/format-check b/SimCore/.github/format-check deleted file mode 100755 index 1150e4fbf..000000000 --- a/SimCore/.github/format-check +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# formatting using the ldmx/dev image which has clang-format in it - -set -o errexit -set -o nounset - -if [ -z "${GITHUB_WORKSPACE+x}" ]; then - # we are not in github actions so we need to error out - echo "ERROR: this script expects to be run in GitHub actions so should not be run locally." - exit 1 -fi - -ldmx() { - docker \ - run \ - --rm \ - --volume ${GITHUB_WORKSPACE} \ - --env LDMX_BASE=${GITHUB_WORKSPACE} \ - ldmx/dev:latest \ - ${PWD} - $@ -} -find include/ -type f > ${TMPDIR:-/tmp}/files-to-format.list -find src/ -type f >> ${TMPDIR:-/tmp}/files-to-format.list -ldmx clang-format --verbose -Werror --dry-run $(cat ${TMPDIR:-/tmp}/files-to-format.list) diff --git a/SimCore/.github/workflows/format-check.yml b/SimCore/.github/workflows/format-check.yml deleted file mode 100644 index bfe16ba29..000000000 --- a/SimCore/.github/workflows/format-check.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Check Format -on: - push: - branches: - - 'trunk' - pull_request: - -jobs: - clang-format: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: run format check - run: ./.github/format-check