Skip to content

Commit

Permalink
test macos
Browse files Browse the repository at this point in the history
  • Loading branch information
wasabrot committed Mar 6, 2024
1 parent 81e56a1 commit 3618717
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 14 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docker-build-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ jobs:
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

# https://docs.docker.com/build/ci/github-actions/multi-platform/
- name: Build Image
id: docker_build
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/docker-build-matrix_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest]
platform:
# - linux/arm64
# - arm64v8
# - darwin/amd64
# - linux/amd64
- linux/arm/v7
- linux/arm/v8
# - linux/arm64
# platform:
# # - linux/arm64
# # - arm64v8
# # - darwin/amd64
# # - linux/amd64
# # - linux/arm/v7
# # - linux/arm/v8
# - linux/arm64

steps:
- name: Echo variables
Expand Down
16 changes: 13 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,47 @@
FROM debian:12.5-slim as build

# Install required dependencies

RUN apt-get update && apt-get install -y \
curl \
build-essential \
git \
pkg-config \
libssl-dev \
cmake
cmake \
python3 \
ninja-build \
perl qpdf xxd libxml2-utils

# Install Rust 1.75
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75

ENV PATH="/root/.cargo/bin:${PATH}"


RUN apt update && apt install -y perl qpdf xxd libxml2-utils
RUN cargo install cargo-binstall --version 1.6.2
RUN cargo binstall cargo-risczero -y --version 0.19.1

# Conditionally install the cargo risczero toolchain based on the platform
ARG PLATFORM
RUN echo "PLATFORM: $PLATFORM"
RUN if [ "$PLATFORM" != "linux/amd64" ]; then \
cargo risczero build-toolchain; \
else \
cargo risczero install; \
fi
# qdpf is for zlib flate
# Test toolchain installation
RUN rustup toolchain list --verbose | grep risc0



COPY data data
COPY host host
COPY verifier verifier
COPY methods methods
COPY Cargo.toml Cargo.lock /
COPY rust-toolchain.toml /
RUN rustup toolchain install .

# create directory holding generated Image Id of Computation which will be proved.
RUN mkdir -p /host/out
Expand Down

0 comments on commit 3618717

Please sign in to comment.