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
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ steps:
- cp /usr/local/bin/mina cli/bin/

- name: build
image: rust:1.80-bullseye
image: rust:1.83-bullseye
commands:
- apt-get update && apt-get install -y libssl-dev libjemalloc-dev jq protobuf-compiler
- rustup update 1.80 && rustup default 1.80
- rustup update 1.83 && rustup default 1.83
- rustup component add rustfmt
# just to be sure it builds without errors
- cargo build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:

- name: Setup Rust
run: |
rustup default 1.80
rustup default 1.83
rustup component add rustfmt

- name: Setup Rust Cache
Expand All @@ -100,7 +100,7 @@ jobs:

- name: Setup Rust
run: |
rustup default 1.80
rustup default 1.83
rustup component add rustfmt

- name: Setup Rust Cache
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:

- name: Setup Rust
run: |
rustup default 1.80
rustup default 1.83
rustup component add rustfmt

- name: Setup Rust Cache
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:

- name: Setup Rust
run: |
rustup default 1.80
rustup default 1.83
rustup component add rustfmt

- name: Setup Rust Cache
Expand Down Expand Up @@ -351,7 +351,7 @@ jobs:
with:
pattern: tests*
merge-multiple: true

- name: Download tests
uses: actions/download-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rust:buster AS build
RUN apt-get update && apt-get install -y protobuf-compiler && apt-get clean
RUN rustup default 1.80 && rustup component add rustfmt
RUN rustup default 1.83 && rustup component add rustfmt
WORKDIR /openmina
COPY . .
RUN cargo build --release --package=cli --bin=openmina
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ Open up the command line and enter the following:
And then:

```sh
# Install rustup and set the default Rust toolchain to 1.80 (newer versions work too)
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.80
# Install rustup and set the default Rust toolchain to 1.83 (newer versions work too)
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.83
# Setup the current shell with rustup
source "$HOME/.cargo/env"
# Clone the openmina repository
Expand Down
6 changes: 3 additions & 3 deletions docker/producer-dashboard/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80 AS app-builder
FROM rust:1.83 AS app-builder

WORKDIR /usr/src/openmina-producer-dashboard

Expand Down Expand Up @@ -77,10 +77,10 @@ RUN eval $(opam config env) && make build_all_sigs
FROM ubuntu:latest

RUN apt-get update && apt-get install -y libpq5 libjemalloc2

COPY --from=app-builder /usr/local/cargo/bin/openmina-producer-dashboard /usr/local/bin/openmina-producer-dashboard
COPY --from=mina-builder /go/mina/src/app/libp2p_helper/result/bin/libp2p_helper /usr/local/bin/coda-libp2p_helper
COPY --from=mina-builder /go/mina/_build/default/src/app/cli/src/mina_testnet_signatures.exe /usr/local/bin/mina

# TODO: replace
ENTRYPOINT [ "openmina-producer-dashboard" ]
ENTRYPOINT [ "openmina-producer-dashboard" ]
2 changes: 1 addition & 1 deletion node/testing/docker/Dockerfile.openmina
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

RUN rm /bin/sh && ln -s /bin/bash /bin/sh

RUN source ~/.cargo/env && rustup update 1.80
RUN source ~/.cargo/env && rustup update 1.83

RUN git clone https://github.com/openmina/openmina

Expand Down
2 changes: 1 addition & 1 deletion node/testing/docker/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM vladsimplestakingcom/mina-openmina-builder:focal AS builder

RUN git fetch && git checkout feat/tests-with-debugger

RUN source ~/.cargo/env && cargo +1.80 build --release -p openmina-node-testing --bin runner --bin openmina-node-testing
RUN source ~/.cargo/env && cargo +1.83 build --release -p openmina-node-testing --bin runner --bin openmina-node-testing

FROM vladsimplestakingcom/mina-debugger:2.0.0rampup4-focal

Expand Down
4 changes: 2 additions & 2 deletions run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ spec:
- |
apt-get update && apt-get -y install git curl gcc libssl-dev pkg-config
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
PATH=$PATH:~/.cargo/bin && rustup update 1.80
PATH=$PATH:~/.cargo/bin && rustup update 1.83
git clone https://github.com/openmina/openmina
cd openmina
git fetch && git checkout feat/tweak-for-debugger
PATH=$PATH:~/.cargo/bin && cargo +1.80 build --release --bin openmina -p cli --no-default-features
PATH=$PATH:~/.cargo/bin && cargo +1.83 build --release --bin openmina -p cli --no-default-features
cp target/release/openmina /usr/local/bin/openmina
openmina node -p 10000 --libp2p-port 8302
ports:
Expand Down
2 changes: 1 addition & 1 deletion tools/bootstrap-sandbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80.0-bullseye AS builder
FROM rust:1.83.0-bullseye AS builder

RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts

Expand Down