Skip to content
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
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: CI checks

on:
workflow_dispatch:
inputs:
force_aptos_cli_install:
description: "Skip Aptos CLI cache and force reinstall"
required: false
type: boolean
default: false
pull_request:
types: [synchronize, opened, reopened, ready_for_review]
push:
Expand All @@ -25,14 +32,15 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: Cache Aptos CLI
if: ${{ inputs.force_aptos_cli_install != true }}
id: cache-aptos
uses: actions/cache@v4
with:
path: ~/aptos-cli/aptos
key: aptos-cli-v7.11.1-${{ runner.os }}-${{ runner.arch }}

- name: Install Aptos CLI v7.11.1 (fixed version)
if: steps.cache-aptos.outputs.cache-hit != 'true'
if: ${{ inputs.force_aptos_cli_install == true || steps.cache-aptos.outputs.cache-hit != 'true' }}
run: |
mkdir -p ~/aptos-cli

Expand Down Expand Up @@ -70,7 +78,7 @@ jobs:
run: |
aptos move test --package-dir ./packages/common --skip-fetch-latest-git-deps --dev --experiments spec-check=off
aptos move test --package-dir ./packages/verifier --skip-fetch-latest-git-deps --dev --experiments spec-check=off
# aptos move test --package-dir ./packages/api --skip-fetch-latest-git-deps --dev --experiments spec-check=off
aptos move test --package-dir ./packages/api --skip-fetch-latest-git-deps --dev --experiments spec-check=off

- name: Run Rust tests
run: cargo test --workspace --all-features
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ members = [
resolver = "2"

[workspace.package]
version = "0.1.0"
version = "1.0.0"
authors = [ "zkmove contributors" ]
repository = "https://github.com/zkmove/halo2-verifier.move"
categories = ["cryptography"]
Expand Down
1 change: 1 addition & 0 deletions crates/halo2-verifier/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "halo2-verifier"
version.workspace = true
authors.workspace = true
edition.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
15 changes: 4 additions & 11 deletions crates/vk-gen-examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "vk-gen-examples"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -14,12 +15,4 @@ halo2_backend.workspace=true
hex.workspace=true
rand.workspace = true
rand_core.workspace=true
anyhow.workspace=true


#[patch."https://github.com/zkmove/halo2.git"]
#halo2_proofs = { path = "../../../halo2/halo2_proofs" }
#halo2_backend = { path = "../../../halo2/halo2_backend" }

#[patch."https://github.com/zkmove/halo2curves"]
#halo2curves = { path = "../../../halo2curves" }
anyhow.workspace=true
2 changes: 1 addition & 1 deletion packages/api/Move.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "verifier-api"
version = "0.1.0"
version = "1.0.0"
authors = ["zkmove contributors"]

[addresses]
Expand Down