Merge pull request #1759 from jsutcodes/fix/ubuntu_docker_gh_action

[WIP] Update missing CMAKE_CXX_COMPILER env in ubuntu dockerfile

Author: TheJJ

.github/workflows/ubuntu-24.04.yml

@@ -41,7 +41,7 @@ jobs:
     - name: Build openage
       run: |
         sudo docker run --rm -v "$(pwd)":/mnt/openage -w /mnt/openage openage-devenv:latest \
-          bash -c 'mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(which gcc-11) -DCMAKE_CXX_COMPILER=$(which g++-11) -DCMAKE_CXX_FLAGS='' -DCMAKE_EXE_LINKER_FLAGS='' -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_MODULE_LINKER_FLAGS='' -DCMAKE_SHARED_LINKER_FLAGS='' -DDOWNLOAD_NYAN=YES -DCXX_OPTIMIZATION_LEVEL=auto -DCXX_SANITIZE_FATAL=False -DCXX_SANITIZE_MODE=none -DWANT_BACKTRACE=if_available -DWANT_GPERFTOOLS_PROFILER=if_available -DWANT_GPERFTOOLS_TCMALLOC=False -DWANT_INOTIFY=if_available -DWANT_NCURSES=if_available -DWANT_OPENGL=if_available -DWANT_VULKAN=if_available -G Ninja .. && cmake --build . --parallel $(nproc) -- -k1'
+          bash -c 'mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(which gcc) -DCMAKE_CXX_COMPILER=$(which g++) -DCMAKE_CXX_FLAGS='' -DCMAKE_EXE_LINKER_FLAGS='' -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_MODULE_LINKER_FLAGS='' -DCMAKE_SHARED_LINKER_FLAGS='' -DDOWNLOAD_NYAN=YES -DCXX_OPTIMIZATION_LEVEL=auto -DCXX_SANITIZE_FATAL=False -DCXX_SANITIZE_MODE=none -DWANT_BACKTRACE=if_available -DWANT_GPERFTOOLS_PROFILER=if_available -DWANT_GPERFTOOLS_TCMALLOC=False -DWANT_INOTIFY=if_available -DWANT_NCURSES=if_available -DWANT_OPENGL=if_available -DWANT_VULKAN=if_available -G Ninja .. && cmake --build . --parallel $(nproc) -- -k1'
     - name: Compress build artifacts
       run: |
         mkdir -p /tmp/openage

copying.md

@@ -164,6 +164,7 @@ _the openage authors_ are:
 | Haytham Tang                | haytham918                  | yunxuant à umich dawt edu                         |
 | Ana Trias-Labellarte        | anatriaslabella             | ana dawt triaslabella à ufl dawt edu              |
 | Eelco Empting               | Eeelco                      | me à eelco dawt de                                |
+| Jordan Sutton               | jsutCodes                   | jsutcodes à gmail dawt com                        |
 
 If you're a first-time committer, add yourself to the above list. This is not
 just for legal reasons, but also to keep an overview of all those nicknames.

packaging/docker/devenv/Dockerfile.ubuntu.2404

@@ -36,4 +36,4 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y sudo \
     qt6-multimedia-dev \
     qml6-module-qtquick3d-spatialaudio \
     && sudo apt-get clean \
-    && truncate -s 0 ~/.bash_history
+    && truncate -s 0 ~/.bash_history