Skip to content

Commit

Permalink
Merge branch 'master' into lpt
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz-h committed Jul 26, 2024
2 parents c9ad921 + 94b067f commit 56b23fb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 0 additions & 3 deletions .ci/check_format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ while read -r file; do
if [[ $file == *"/boost-stacktrace/"* ]]; then
continue
fi
if [[ $file == *"/glm/"* ]]; then
continue
fi
fi

# ignore 3rd party dirs
Expand Down
2 changes: 2 additions & 0 deletions .ci/docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
xorg-dev \
# libsodium / gmp:
autoconf libtool \
# icu:
autoconf-archive \
# thrift:
flex bison \
# GL/glu.h:
Expand Down

0 comments on commit 56b23fb

Please sign in to comment.