diff --git a/.github/actions/run-cmake-format/action.yaml b/.github/actions/run-cmake-format/action.yaml deleted file mode 100644 index 1a2bed3ff..000000000 --- a/.github/actions/run-cmake-format/action.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: Run cmake-format -description: Runs cmake-format and checks for any changes introduced by it -inputs: - failCondition: - description: Controls whether failed checks also fail the workflow run - required: false - default: never - workingDirectory: - description: Working directory for checks - required: false - default: ${{ github.workspace }} -runs: - using: composite - steps: - - name: Check Runner Operating System 🏃‍♂️ - if: runner.os == 'Windows' - shell: bash - run: | - : Check Runner Operating System 🏃‍♂️ - echo "::notice::run-cmake-format action requires a macOS-based or Linux-based runner." - exit 2 - - - name: Check for Changed Files ✅ - uses: ./.github/actions/check-changes - id: checks - with: - checkGlob: "'*.cmake' '*CMakeLists.txt'" - diffFilter: 'ACM' - - - name: Install Dependencies 🛍️ - if: runner.os == 'Linux' && fromJSON(steps.checks.outputs.hasChangedFiles) - shell: bash - run: | - : Install Dependencies 🛍️ - echo ::group::Install Dependencies - eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH - brew install --quiet zsh - echo ::endgroup:: - - - name: Run cmake-format 🎛️ - if: fromJSON(steps.checks.outputs.hasChangedFiles) - id: result - shell: zsh --no-rcs --errexit --pipefail {0} - working-directory: ${{ github.workspace }} - env: - CHANGED_FILES: ${{ steps.checks.outputs.changedFiles }} - run: | - : Run cmake-format 🎛️ - if (( ${+RUNNER_DEBUG} )) setopt XTRACE - - print ::group::Install cmakelang - pip3 install cmakelang - print ::endgroup:: - - print ::group::Run cmake-format - local -a changes=(${(s:,:)CHANGED_FILES//[\[\]\'\"]/}) - ./build-aux/run-cmake-format --fail-${{ inputs.failCondition }} --check ${changes} - print ::endgroup:: diff --git a/build-aux/README.md b/build-aux/README.md index 490b7144a..0b5b133f2 100644 --- a/build-aux/README.md +++ b/build-aux/README.md @@ -3,7 +3,7 @@ This folder contains: - Various formatting scripts: - `run-clang-format` which formats C/C++/ObjC/ObjC++ files - - `run-cmake-format` which formats CMake files + - `run-gersemi` which formats CMake files - `run-swift-format` which formats Swift files - `format-manifest.py` which formats Flatpak manifest JSON files - The Flatpak manifest used to build OBS Studio @@ -23,7 +23,7 @@ Example of use: ./build-aux/run-clang-format ``` -### `run-gersemi-format` +### `run-gersemi` This script allows to check the formatting and/or format of the CMake files and requires ZSH and `gersemi` Python package.