From d4f61d53365e55550d793762d0452df3e42163fa Mon Sep 17 00:00:00 2001
From: iquerejeta <querejeta.azurmendi@iohk.io>
Date: Fri, 20 Dec 2024 17:37:30 +0100
Subject: [PATCH] Resolve issue with CI

Having issues with libfontconfig1 in linux and getrandom in wasm32
---
 .github/workflows/ci.yml           | 13 ++++++++++---
 .github/workflows/lints-beta.yml   |  1 +
 .github/workflows/lints-stable.yml |  1 +
 Cargo.toml                         |  6 ++----
 rust-toolchain                     |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cdce1546c0..23e2bc22e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,15 +17,18 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
         include:
           - feature_set: basic
-            features: batch,dev-graph,gadget-traces
+            features: dev-graph,gadget-traces
           - feature_set: all
-            features: batch,dev-graph,gadget-traces,test-dev-graph,thread-safe-region,sanity-checks,circuit-params
+            features: dev-graph,gadget-traces,test-dev-graph,thread-safe-region,sanity-checks,circuit-params
 
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           override: false
+      - name: Install libfontconfig1-dev
+        if: runner.os == 'Linux'
+        run: sudo apt-get install -y libfontconfig1-dev
       - name: Run tests
         uses: actions-rs/cargo@v1
         with:
@@ -42,6 +45,7 @@ jobs:
           - wasm32-wasi
 
     steps:
+      - run: sudo apt-get install -y libfontconfig1-dev
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
@@ -52,13 +56,14 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --no-default-features --features batch,dev-graph,gadget-traces --target ${{ matrix.target }}
+          args: --no-default-features --features dev-graph,gadget-traces --target ${{ matrix.target }}
 
   bitrot:
     name: Bitrot check
     runs-on: ubuntu-latest
 
     steps:
+      - run: sudo apt-get install -y libfontconfig1-dev
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
@@ -75,6 +80,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - run: sudo apt-get install -y libfontconfig1-dev
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
@@ -97,6 +103,7 @@ jobs:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
+      - run: sudo apt-get install -y libfontconfig1-dev
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
diff --git a/.github/workflows/lints-beta.yml b/.github/workflows/lints-beta.yml
index e7fffa7a76..4077469819 100644
--- a/.github/workflows/lints-beta.yml
+++ b/.github/workflows/lints-beta.yml
@@ -12,6 +12,7 @@ jobs:
     continue-on-error: true
 
     steps:
+      - run: sudo apt-get install -y libfontconfig1-dev
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
diff --git a/.github/workflows/lints-stable.yml b/.github/workflows/lints-stable.yml
index 7666dae1df..a7ff199bbc 100644
--- a/.github/workflows/lints-stable.yml
+++ b/.github/workflows/lints-stable.yml
@@ -10,6 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - run: sudo apt-get install -y libfontconfig1-dev
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
diff --git a/Cargo.toml b/Cargo.toml
index a12a604279..393a017f14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,14 +64,13 @@ assert_matches = "1.5"
 criterion = "0.3"
 gumdrop = "0.8"
 proptest = "1"
-rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
 serde_json = "1"
 
-[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
+[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2", features = ["js"] }
 
 [features]
-default = ["batch", "bits"]
+default = ["bits"]
 dev-graph = ["plotters", "tabbycat"]
 test-dev-graph = [
     "dev-graph",
@@ -83,7 +82,6 @@ bits = ["halo2curves/bits"]
 gadget-traces = ["backtrace"]
 thread-safe-region = []
 sanity-checks = []
-batch = ["rand_core/getrandom"]
 circuit-params = []
 cost-estimator = ["serde", "serde_derive"]
 derive_serde = ["halo2curves/derive_serde"]
diff --git a/rust-toolchain b/rust-toolchain
index aaceec04e0..79e15fd493 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.80.0
+1.77.0