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
9 changes: 4 additions & 5 deletions .github/actions/setup-container-deps/action.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: 'Setup Container Dependencies'
description: 'Install libssl3 in container for OpenMina binaries'
description: 'Install libssl3t64 in container for OpenMina binaries'
runs:
using: 'composite'
steps:
- name: Install libssl3
- name: Install libssl3t64
shell: bash
run: |
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
apt-get update && \
apt-get install -y --no-install-recommends libssl3 curl && \
apt-get install -y --no-install-recommends libssl3t64 curl && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
21 changes: 9 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ jobs:
needs: [ build-tests, build-tests-webrtc ]
runs-on: ubuntu-24.04
container:
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
options: --volume debugger_data:/tmp/db
env:
BPF_ALIAS: /coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0
Expand All @@ -259,11 +259,10 @@ jobs:
- 80:80

steps:
- name: Install libssl3 # Our binaries are built on a newer ubuntu and require libssl3
- name: Install libssl3t64 # Our binaries are built on a newer ubuntu and require libssl3t64
run: |
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
apt-get update && \
apt-get install -y --no-install-recommends libssl3 && \
apt-get install -y --no-install-recommends libssl3t64 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -300,7 +299,7 @@ jobs:
- build-tests-webrtc
runs-on: ubuntu-24.04
container:
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
options: --volume debugger_data:/tmp/db
env:
# to allow local addrs discovery
Expand Down Expand Up @@ -340,11 +339,10 @@ jobs:
- 80:80

steps:
- name: Install libssl3 # Our binaries are built on a newer ubuntu and require libssl3
- name: Install libssl3t64 # Our binaries are built on a newer ubuntu and require libssl3t64
run: |
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
apt-get update && \
apt-get install -y --no-install-recommends libssl3 && \
apt-get install -y --no-install-recommends libssl3t64 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -387,7 +385,7 @@ jobs:
- build-tests-webrtc
runs-on: ubuntu-24.04
container:
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
env:
# to allow local addrs discovery
OPENMINA_DISCOVERY_FILTER_ADDR: false
Expand All @@ -397,11 +395,10 @@ jobs:
fail-fast: false

steps:
- name: Install libssl3 # Our binaries are built on a newer ubuntu and require libssl3
- name: Install libssl3t64 # Our binaries are built on a newer ubuntu and require libssl3t64
run: |
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
apt-get update && \
apt-get install -y --no-install-recommends libssl3 && \
apt-get install -y --no-install-recommends libssl3t64 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#1158](https://github.com/o1-labs/openmina/issues/1158))
- Update the CI and code to compare with the latest release 3.2.0-beta1-978866c
([#1250](https://github.com/o1-labs/openmina/pull/1250)
- Update the CI and code to compare with the latest release 3.2.0-beta2-939b08d
([#1250](https://github.com/o1-labs/openmina/pull/1285)


### Added
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.archive.devnet.compare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ services:
condition: service_healthy

node-ocaml:
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
container_name: node-ocaml
environment:
MINA_CLIENT_TRUSTLIST: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
Expand Down
4 changes: 2 additions & 2 deletions node/testing/src/node/ocaml/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl Default for OcamlNodeTestingConfig {
fn default() -> Self {
Self {
initial_peers: vec![],
daemon_json: DaemonJson::Custom("/var/lib/coda/config_978866cd.json".to_owned()),
daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()),
block_producer: None,
}
}
Expand Down Expand Up @@ -131,7 +131,7 @@ impl OcamlNodeConfig {
impl OcamlNodeExecutable {
// pub const DEFAULT_DOCKER_IMAGE: &'static str = "vladsimplestakingcom/mina-light:2.0.0rampup4";
pub const DEFAULT_DOCKER_IMAGE: &'static str =
"gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet";
"gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet";
pub const DEFAULT_MINA_EXECUTABLE: &'static str = "mina";

fn docker_container_name(tmp_dir: &temp_dir::TempDir) -> String {
Expand Down
2 changes: 1 addition & 1 deletion node/testing/src/node/ocaml/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ fn run_ocaml() {
graphql_port: 3086,
client_port: 8301,
initial_peers: Vec::new(),
daemon_json: DaemonJson::Custom("/var/lib/coda/config_978866cd.json".to_owned()),
daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()),
block_producer: None,
})
.unwrap();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl MultiNodeBasicConnectivityPeerDiscovery {

let ocaml_seed_config = OcamlNodeTestingConfig {
initial_peers: Vec::new(),
daemon_json: DaemonJson::Custom("/var/lib/coda/config_978866cd.json".to_owned()),
daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()),
block_producer: None,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl SoloNodeBasicConnectivityAcceptIncoming {
let node_id = runner.add_ocaml_node(OcamlNodeTestingConfig {
initial_peers: vec![node_addr.clone()],
daemon_json: DaemonJson::Custom(
"/var/lib/coda/config_978866cd.json".to_owned(),
"/var/lib/coda/config_939b08d8.json".to_owned(),
),
block_producer: None,
});
Expand Down
Loading