Merge branch 'fix/docker-hotfix' into feat/building-output

tudelft3d · Feb 6, 2025 · b42b568 · b42b568
2 parents cbad111 + fc3d52c
commit b42b568
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,15 +16,15 @@ jobs:
         run: |
             sudo apt-get update
             sudo apt-get install libgmp-dev libmpfr-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
-      - name: Download CGAL 6.0
+      - name: Download CGAL 6.0.1
         run: |
-            wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz -P ${{ github.workspace }}
+            wget https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz -P ${{ github.workspace }}
             cd ${{ github.workspace }}
-            tar -xvf CGAL-6.0-library.tar.xz
+            tar -xvf CGAL-6.0.1-library.tar.xz
       - name: Build
         run: |
             mkdir build && cd build
-            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0 && make -j4
+            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0.1 && make -j4
 
   build_linux_2204:
     runs-on: ubuntu-22.04
@@ -34,15 +34,15 @@ jobs:
         run: |
             sudo apt-get update
             sudo apt-get install libgmp-dev libmpfr-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
-      - name: Download CGAL 6.0
+      - name: Download CGAL 6.0.1
         run: |
-            wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz -P ${{ github.workspace }}
+            wget https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz -P ${{ github.workspace }}
             cd ${{ github.workspace }}
-            tar -xvf CGAL-6.0-library.tar.xz
+            tar -xvf CGAL-6.0.1-library.tar.xz
       - name: Build
         run: |
             mkdir build && cd build
-            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0 && make -j4
+            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0.1 && make -j4
 
   build_macos:
     runs-on: macos-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## [0.6.1] - 2025-02-05
+### Fixed
+- Docker image hotfix
 
 ## [0.6.0] - 2025-01-03
 ### Changed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,11 +34,11 @@ endif (WIN32)
 
 # CGAL
 find_package(CGAL REQUIRED)
-if (CGAL_VERSION VERSION_GREATER_EQUAL "5.5")
+if (CGAL_VERSION VERSION_GREATER_EQUAL "6.0.1")
    message(STATUS "Found CGAL version ${CGAL_VERSION}")
 else()
    message(FATAL_ERROR "Found CGAL version ${CGAL_VERSION} which is not supported!"
-           "Please use CGAL version 5.5 or higher")
+           " Please use CGAL version 6.0.1 or higher")
    return()
 endif ()
 

diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ GMP, MFPR, and Eigen are necessary dependencies for CGAL.
 
 Dependencies are generally available in Linux distributions, e.g. in Debian/Ubuntu/Mint:
 ```
-sudo apt-get install libcmpfr-dev libgmp-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
+sudo apt-get install libmpfr-dev libgmp-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
 ```
 
 CGAL can be directly downloaded from the [release page](https://github.com/CGAL/cgal/releases/tag/v5.6.1) (-library). No install is necessary, only the path to the unzipped folder is required (see below).

diff --git a/docker/city4cfd-build-base.dockerfile b/docker/city4cfd-build-base.dockerfile
@@ -24,9 +24,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /tmp/*
 
 # Download and extract CGAL
-RUN wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz \
-    && tar -xf CGAL-6.0-library.tar.xz -C /opt \
-    && rm CGAL-6.0-library.tar.xz
+RUN wget https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz \
+    && tar -xf CGAL-6.0.1-library.tar.xz -C /opt \
+    && rm CGAL-6.0.1-library.tar.xz
 
 # Set environment variable for CGAL
-ENV CGAL_DIR=/opt/CGAL-6.0
+ENV CGAL_DIR=/opt/CGAL-6.0.1
diff --git a/src/main.cpp b/src/main.cpp
@@ -79,7 +79,7 @@ void printVersion() {
 }
 
 int main(int argc, char** argv) {
-//    try {
+    try {
         printWelcome();
 
         auto startTime = std::chrono::steady_clock::now();
@@ -139,12 +139,12 @@ int main(int argc, char** argv) {
         std:: cout << "End" << std::endl;
 
         return EXIT_SUCCESS;
-//    } catch (std::exception& e) {
-//        //-- Output log
-//        IO::output_log();
-//
-//        std::cerr << "\nProgram failed! Reason: " << e.what() << std::endl;
-//        std::cout << "End" << std::endl;
-//        return EXIT_FAILURE;
-//    }
+    } catch (std::exception& e) {
+        //-- Output log
+        IO::output_log();
+
+        std::cerr << "\nProgram failed! Reason: " << e.what() << std::endl;
+        std::cout << "End" << std::endl;
+        return EXIT_FAILURE;
+    }
 }