From 06f3aee731bd45f262ce168804bb8a58c090ab79 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Feb 2025 00:57:16 +0300 Subject: [PATCH 1/5] update Dockerfile --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83a4a05c..f52496de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -# Build docker container: docker build -t voxel-engine . -# Build project: docker run --rm -it -v$(pwd):/project voxel-engine bash -c "cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && cmake --build build" -# Run project in docker: docker run --rm -it -v$(pwd):/project -v/tmp/.X11-unix:/tmp/.X11-unix -v${XAUTHORITY}:/home/user/.Xauthority:ro -eDISPLAY --network=host voxel-engine ./build/VoxelEngine +# Build docker container: docker build -t voxelcore . +# Build project: docker run --rm -it -v$(pwd):/project voxelcore bash -c "cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE -Bbuild && cmake --build build" +# Run project in docker: docker run --rm -it -v$(pwd):/project -v/tmp/.X11-unix:/tmp/.X11-unix -v${XAUTHORITY}:/home/user/.Xauthority:ro -eDISPLAY --network=host voxelcore ./build/VoxelEngine -FROM debian:bullseye-slim -LABEL Description="Docker container for building VoxelEngine for Linux" +FROM debian:bookworm-slim +LABEL Description="Docker container for building VoxelCore for Linux" # Install dependencies RUN apt-get update && apt-get install --no-install-recommends -y \ @@ -17,6 +17,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ libglfw3-dev \ libglfw3 \ libglew-dev \ + libglew2.2 \ libglm-dev \ libpng-dev \ libopenal-dev \ From 71b313dee0d097e9559af89024220716ddcd4ad5 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Feb 2025 01:02:09 +0300 Subject: [PATCH 2/5] update appimage.yml --- .github/workflows/appimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 14805655..e787016b 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev \ + sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \ libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \ libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind # fix luajit paths From f21fdbe9682b6ad84d3f029e65088971660cbdcf Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Feb 2025 01:04:09 +0300 Subject: [PATCH 3/5] update libglew version in AppImageBuilder.yml --- dev/AppImageBuilder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/AppImageBuilder.yml b/dev/AppImageBuilder.yml index 69e687e4..9f0ee3b1 100644 --- a/dev/AppImageBuilder.yml +++ b/dev/AppImageBuilder.yml @@ -23,7 +23,7 @@ AppDir: - libfam0 - libgcrypt20 - libglfw3 - - libglew2.1 + - libglew2.2 - libpng16-16 - libopenal1 - libasound2 From 84ff983fd693ab39d45febd82b1f4dcc42d3d901 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Feb 2025 01:23:40 +0300 Subject: [PATCH 4/5] update AppImageBuilder.yml --- dev/AppImageBuilder.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/AppImageBuilder.yml b/dev/AppImageBuilder.yml index 9f0ee3b1..f4ffe233 100644 --- a/dev/AppImageBuilder.yml +++ b/dev/AppImageBuilder.yml @@ -11,12 +11,12 @@ AppDir: apt: arch: amd64 sources: - - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32' key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C' - - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse - - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse - - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse include: - libbz2-1.0 - libexpat1 From 865073d5cd675fb7c551a9c7493b4bb4c2d33c89 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Feb 2025 02:10:41 +0300 Subject: [PATCH 5/5] downgrade appimage action ubuntu version --- .github/workflows/appimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index e787016b..ed214cd0 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-22.04 runs-on: ${{ matrix.os }}