Skip to content

Commit

Permalink
Resolve issue with CI
Browse files Browse the repository at this point in the history
Having issues with libfontconfig1 in linux and getrandom in wasm32
  • Loading branch information
iquerejeta committed Dec 27, 2024
1 parent d3a6715 commit d4f61d5
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lints-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lints-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.80.0
1.77.0

0 comments on commit d4f61d5

Please sign in to comment.