spacegaier/develop

.github/workflows/build_docker.yml

@@ -1,8 +1,8 @@
 name: Build Docker image
 on:
   push:
-    branches: ["develop"]
-    tags: ["v*"]
+    branches: ["develop", "latest"]
+  workflow_dispatch:
 
 concurrency: docker
 
@@ -13,31 +13,33 @@ jobs:
     steps:
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/educelab/volume-cartographer
+          images: ghcr.io/spacegaier/volume-cartographer
           tags: |
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=raw,value=edge,enable={{is_default_branch}}
+            # set latest tag for branch named "latest"
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'latest') }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64

.github/workflows/unit_tests.yml

@@ -25,6 +25,11 @@ jobs:
       with:
         fetch-depth: 20
 
+    - name: Install SDL & GSL tool
+      run: |
+        apt-get update
+        apt-get install -y libsdl2-dev libgsl-dev
+
     - name: Build volume-cartographer
       run: |
         cmake -S . -B build/ -GNinja $EXTRA_CMAKE_FLAGS
@@ -48,10 +53,15 @@ jobs:
       with:
         fetch-depth: 20
 
+    - name: Install SDL & GSL tool
+      run: |
+        apt-get update
+        apt-get install -y libsdl2-dev libgsl-dev
+
     - name: Build volume-cartographer
       run: |
         cmake -S . -B build/ -GNinja $EXTRA_CMAKE_FLAGS
         cmake --build build/
 
     - name: Run tests
-      run: ctest -V --test-dir build/
+      run: ctest -V --test-dir build/

.gitignore

@@ -50,4 +50,7 @@ docs/html/
 cmake-build*/
 
 # VS Code
-.vscode/
+.vscode/
+
+# personal
+*.txt

CMakeLists.txt

@@ -104,4 +104,10 @@ endif()
 # Setup the config files #
 include(VCPackageConfig)
 # Install to system directories
-include(VCInstall)
+include(VCInstall)
+
+# Look for the SDL2 package for Audio
+find_package(SDL2 REQUIRED)
+
+# Look for the GNU Scientific Library (GSL) package for interpolation related functionalities
+find_package(GSL REQUIRED)

Dockerfile

@@ -1,6 +1,13 @@
 FROM ghcr.io/educelab/ci-docker:dynamic.12.0
 MAINTAINER Seth Parker <[email protected]>
 
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y libsdl2-dev libgsl-dev locales
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
 # Install volcart
 COPY ./ /volume-cartographer/
 RUN export CMAKE_PREFIX_PATH="/usr/local/Qt-6.6.1/" \
@@ -10,10 +17,11 @@ RUN export CMAKE_PREFIX_PATH="/usr/local/Qt-6.6.1/" \
       -GNinja  \
       -DCMAKE_BUILD_TYPE=Release  \
       -DCMAKE_INSTALL_RPATH=/usr/local/Qt-6.6.1/lib \
+      -DSDL2_DIR=/usr/lib/x86_64-linux-gnu/ \
       -DVC_BUILD_ACVD=ON  \
     && cmake --build /volume-cartographer/build/ \
     && cmake --install /volume-cartographer/build/ \
     && rm -rf /volume-cartographer/
 
 # Start an interactive shell
-CMD ["/bin/bash"]
+ENTRYPOINT export QT_PLUGIN_PATH=/usr/local/Qt-6.6.1/plugins && /bin/bash