fix build workflow

NilFoundation · Nov 24, 2023 · 748f425 · 748f425
1 parent 65e5ec5
commit 748f425
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,24 @@ jobs:
             libicu-dev \
             curl \
             pkg-config \
-            libspdlog-dev
+            wget \
+            \
+            libspdlog-dev \
+            liblz4-dev \
+            libgnutls28-dev \
+            libprotobuf-dev \
+            libyaml-cpp-dev \
+            libsctp-dev \
+            ragel \
+            xfslibs-dev \
+            systemtap-sdt-dev \
+            libc-ares-dev \
+            libhwloc-dev
+
+          # Everything will be cleaned on checkout anyway
+          wget http://launchpadlibrarian.net/466750967/libfmt-dev_6.1.2+ds-2_amd64.deb
+          apt remove -y libfmt-dev
+          apt install -y ./libfmt-dev_6.1.2+ds-2_amd64.deb
 
       - name: Print toolchain information
         run: |
@@ -50,12 +67,12 @@ jobs:
         with:
           submodules: 'recursive'
           fetch-depth: 0
-          
+
       - name: Install Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-          
+
       # Workaround: https://github.com/actions/checkout/issues/1169
       - name: Mark directory as safe
         run: |
@@ -84,13 +101,14 @@ jobs:
         run: |
           cmake -G "Unix Makefiles" \
             -B build \
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_WITH_NUMA=FALSE
 
       - name: Build proof-producer
         env:
            BOOST_ROOT: "${{ steps.install-boost.outputs.BOOST_ROOT }}"
         run: |
-            cd build 
+            cd build
             make
             cd ..
 
@@ -133,4 +151,3 @@ jobs:
           POOL="ubuntu/pool/main/p/proof-generator"
           aws s3api put-object --bucket deb.nil.foundation --key $POOL/$PROOF_GENERATOR_PACKAGE --body $PROOF_GENERATOR_PACKAGE
           mkrepo s3://deb.nil.foundation/ubuntu/
-  
diff --git a/README.md b/README.md
@@ -17,13 +17,23 @@ ${ZKLLVM_BUILD:-build}/bin/assigner/assigner -b ${ZKLLVM_BUILD:-build}/examples/
 # Building
 1. Install dependencies:
     ```
-    sudo apt-get install liblz4-dev libgnutls28-dev libprotobuf-dev libyaml-cpp-dev libsctp-dev ragel xfslibs-dev systemtap-sdt-dev
+    sudo apt-get install \
+        liblz4-dev \
+        libgnutls28-dev \
+        libprotobuf-dev \
+        libyaml-cpp-dev \
+        libsctp-dev \
+        ragel \
+        xfslibs-dev \
+        systemtap-sdt-dev \
+        libc-ares-dev \
+        libhwloc-dev
     ```
 2. Install specific version of *libmft-dev*:
     ```
-    wget http://launchpadlibrarian.net/466750967/libfmt-dev_6.1.2+ds-2_amd64. deb
-    sudo apt remove libfmt-dev
-    sudo apt install ./libfmt-dev_6.1.2+ds-2_amd64.deb
+    wget http://launchpadlibrarian.net/466750967/libfmt-dev_6.1.2+ds-2_amd64.deb
+    sudo apt remove -y libfmt-dev
+    sudo apt install -y ./libfmt-dev_6.1.2+ds-2_amd64.deb
     ```
 3. Build with CMake:
     ```mkdir build