Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: keep asm feature on all arch for backward compatibility #40

Merged
merged 2 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
feature_set: [basic, all]
os: [ubuntu-latest, windows-latest, macOS-latest]
include:
- feature_set: basic
features: --features batch,dev-graph,gadget-traces,circuit-params
- feature_set: all
features: --all-features
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
Expand All @@ -25,11 +19,28 @@ jobs:
run: |
# https://crates.io/crates/font-kit
sudo apt install pkg-config libfreetype6-dev libfontconfig1-dev
- name: Run tests
- name: Run tests with basic features
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --release --workspace --no-default-features ${{ matrix.features }}
args: --verbose --release --workspace --no-default-features --features batch,dev-graph,gadget-traces,circuit-params
- name: Get all features
id: get-features
shell: bash
run: |
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
echo "features=--all-features" >> $GITHUB_OUTPUT
else
# Get all features except 'asm' and format them for cargo
FEATURES=$(cargo metadata --format-version 1 | \
jq -r '.packages[] | select(.name == "halo2-axiom") | .features | keys - ["asm"] | join(",")')
echo "features=--features ${FEATURES}" >> $GITHUB_OUTPUT
fi
- name: Run tests with all features
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --release --workspace --no-default-features ${{ steps.get-features.outputs.features }}

build:
name: Build target ${{ matrix.target }}
Expand Down
5 changes: 1 addition & 4 deletions halo2_proofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ sanity-checks = []
batch = ["rand/getrandom"]
profile = ["dep:ark-std"]
circuit-params = []

[target.'cfg(target_arch = "x86")'.features]
asm = ["halo2curves/asm"]
[target.'cfg(target_arch = "x86_64")'.features]
# only for x86:
asm = ["halo2curves/asm"]

[lib]
Expand Down
Loading