Skip to content

Commit

Permalink
Update clang-format
Browse files Browse the repository at this point in the history
- Rename travis dir
- Use same versions as in the i3 workflows
  • Loading branch information
orestisfl committed May 23, 2024
1 parent a7ebe81 commit f3ffb67
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
- run: git fetch --prune --unshallow
- name: fetch or build Docker container
run: |
docker build --pull --no-cache --rm -t=i3lock -f travis/Dockerfile .
docker build --pull --no-cache --rm -t=i3lock -f ci/Dockerfile .
docker run -e CC -v $PWD:/usr/src:rw i3lock /bin/sh -c 'git config --global --add safe.directory /usr/src && mkdir build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror" meson .. && ninja'
formatting:
name: Check formatting
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install dependencies
run: |
sudo apt-get install -y clang-format-11
sudo apt-get install -y clang-format-15
- name: Check formatting
run: clang-format-11 --dry-run --Werror $(git ls-files '*.c' 'include/*.h')
run: clang-format-15 --dry-run --Werror $(git ls-files '*.c' 'include/*.h')
2 changes: 1 addition & 1 deletion travis/Dockerfile → ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
# (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.

# Install mk-build-deps (for installing the i3 build dependencies),
# clang and clang-format-9 (for checking formatting and building with clang),
# clang (for building),
# lintian (for checking spelling errors),
# test suite dependencies (for running tests)
RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion meson/meson-dist-script
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ cd "${MESON_DIST_ROOT}"
rm -rf \
.clang-format \
.editorconfig \
travis \
ci \
.github

0 comments on commit f3ffb67

Please sign in to comment.