Merge branch 'master' into master

KasperskyLab · Nov 29, 2024 · 28aa165 · 28aa165
2 parents 85199e8 + 2746bcf
commit 28aa165
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/docker-build-image.yml b/.github/workflows/docker-build-image.yml
@@ -15,21 +15,34 @@ on:
       - '.github/workflows/docker-build-image.yml'
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+      - name: Set up Docker
+        uses: crazy-max/ghaction-setup-docker@v3
+        with:
+          daemon-config: |
+            {
+              "debug": true,
+              "features": {
+                "containerd-snapshotter": true
+              }
+            }
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_LOGIN }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/checkout@v4
       - name: Build and push the Docker image for KNP build
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: "{{defaultContext}}:docker/build-image"
+          load: true
           push: true
           tags: ${{ vars.DOCKERHUB_LOGIN }}/knp-build-image:latest
           timeout-minutes: 180

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -302,6 +302,7 @@ add_third_party("gh:BlueBrain/[email protected]"
 add_third_party("gh:p-ranav/[email protected]"
                 OPTIONS
                     "CSV2_BUILD_TESTS OFF"
+                    "CSV2_TEST OFF"
                     "CSV2_SAMPLES OFF")
 
 add_third_party("gh:intel/pcm"

diff --git a/docker/build-image/Dockerfile b/docker/build-image/Dockerfile
@@ -141,9 +141,9 @@ RUN \
   && chmod +x ${DESTINATION} \
   && ln -sf ${DESTINATION} /usr/bin/docker-compose
 
-RUN \
-  wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && dpkg -i libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && rm libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb \
-  && sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf
+#RUN \
+#  wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && dpkg -i libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && rm libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb \
+#  && sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf
 
 # COPY "${OCLINT_FILE}" .
 RUN \

diff --git a/knp/base-framework/CMakeLists.txt b/knp/base-framework/CMakeLists.txt
@@ -76,7 +76,7 @@ knp_add_library("${PROJECT_NAME}-core"
     ${${PROJECT_NAME}_headers}
     ALIAS KNP::BaseFramework::Core
     LINK_PRIVATE
-        spdlog::spdlog Boost::headers Boost::filesystem #[[RapidJSON]] HighFive ${HDF5_LIB} csv2
+        spdlog::spdlog Boost::headers Boost::filesystem HighFive ${HDF5_LIB} csv2 # RapidJSON
         # Hack to build with CLang.
         ${ADD_LIBS}
     LINK_PUBLIC