Skip to content

Commit

Permalink
Fix #699 : Updated Clang Format to 17, update SDL Dovcker image to 2.…
Browse files Browse the repository at this point in the history
…30.4, Vulkan to 1.3.275
  • Loading branch information
vsonnier committed Jun 27, 2024
1 parent ddc06e2 commit b4cfa92
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Packaging/AppImage/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ubuntu:20.04
FROM ubuntu:24.04
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update \
&& apt-get install -y apt-transport-https ca-certificates wget gnupg apt-utils \
&& wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add - \
&& wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.268-focal.list https://packages.lunarg.com/vulkan/1.3.268/lunarg-vulkan-1.3.268-focal.list \
&& wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.275-focal.list https://packages.lunarg.com/vulkan/1.3.275/lunarg-vulkan-1.3.275-focal.list \
&& apt-get update \
&& apt-get install -y \
build-essential \
Expand Down Expand Up @@ -39,10 +39,10 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

RUN cd /tmp \
&& wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz \
&& tar -xzf SDL2-2.28.5.tar.gz \
&& rm SDL2-2.28.5.tar.gz \
&& cd /tmp/SDL2-2.28.5 \
&& wget https://www.libsdl.org/release/SDL2-2.30.4.tar.gz \
&& tar -xzf SDL2-2.30.4.tar.gz \
&& rm SDL2-2.30.4.tar.gz \
&& cd /tmp/SDL2-2.30.4 \
&& ./configure \
&& make -j \
&& make install
Expand Down
2 changes: 1 addition & 1 deletion format.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#/bin/sh
docker run --user $(id -u):$(id -g) -v `pwd`:`pwd` -w `pwd` -i --rm ghcr.io/jidicula/clang-format:15 -i Quake/*.c Quake/*.h Shaders/*.frag Shaders/*.vert Shaders/*.comp Shaders/*.inc Shaders/*.c Shaders/*.h
docker run --user $(id -u):$(id -g) -v `pwd`:`pwd` -w `pwd` -i --rm ghcr.io/jidicula/clang-format:17 -i Quake/*.c Quake/*.h Shaders/*.frag Shaders/*.vert Shaders/*.comp Shaders/*.inc Shaders/*.c Shaders/*.h

0 comments on commit b4cfa92

Please sign in to comment.