diff options
| author | Linus Groh <mail@linusgroh.de> | 2020-12-27 15:36:40 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-12-27 21:25:27 +0100 |
| commit | fec7501d1ab7ee3628d09e6ac8b5a8e72bec821c (patch) | |
| tree | 45505109bebcf1a9474a6bc01fcc90dfe729299b | |
| parent | ee719c23d49677270533cbe924d43dcd550a344d (diff) | |
| download | serenity-fec7501d1ab7ee3628d09e6ac8b5a8e72bec821c.zip | |
Meta: Run lint-prettier.sh on CI
| -rw-r--r-- | .github/workflows/cmake.yml | 6 | ||||
| -rwxr-xr-x | Meta/lint-ci.sh | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 23fc2ccd2f..e17e8a6322 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -27,13 +27,15 @@ jobs: # These packages are already part of the ubuntu-20.04 image: # clang-format-10 cmake gcc-10 g++-10 shellcheck libgmp-dev # These aren't: - run: sudo apt-get install libstdc++-10-dev libmpfr-dev libmpc-dev ninja-build + run: sudo apt-get install libstdc++-10-dev libmpfr-dev libmpc-dev ninja-build npm # If we ever do any qemu-emulation on Github Actions, we should re-enable this: # e2fsprogs qemu-system-i386 qemu-utils + - name: Install prettier + run: sudo npm install -g prettier - name: Use GCC 10 instead run: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10 - name: Check versions - run: set +e; g++ --version; g++-10 --version; clang-format --version; clang-format-10 --version; python --version; python3 --version; ninja --version + run: set +e; g++ --version; g++-10 --version; clang-format --version; clang-format-10 --version; prettier --version; python --version; python3 --version; ninja --version # === PREPARE FOR BUILDING === diff --git a/Meta/lint-ci.sh b/Meta/lint-ci.sh index bf4cbbedc7..746b1365a3 100755 --- a/Meta/lint-ci.sh +++ b/Meta/lint-ci.sh @@ -19,7 +19,8 @@ for cmd in \ Meta/check-style.sh \ Meta/lint-executable-resources.sh \ Meta/lint-ipc-ids.sh \ - Meta/lint-shell-scripts.sh; do + Meta/lint-shell-scripts.sh \ + Meta/lint-prettier.sh; do echo "Running ${cmd}... " if "${cmd}" "$@"; then echo -e "[${GREEN}OK${NC}]: ${cmd}" |