Skip to content

Commit 439900c

Browse files
authored
Merge pull request #1285 from o1-labs/dw/update-beta2
Bump up OCaml node to release 3.2.0-beta2
2 parents b73d276 + e5c8fd2 commit 439900c

File tree

8 files changed

+21
-23
lines changed

8 files changed

+21
-23
lines changed
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: 'Setup Container Dependencies'
2-
description: 'Install libssl3 in container for OpenMina binaries'
2+
description: 'Install libssl3t64 in container for OpenMina binaries'
33
runs:
44
using: 'composite'
55
steps:
6-
- name: Install libssl3
6+
- name: Install libssl3t64
77
shell: bash
88
run: |
9-
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
109
apt-get update && \
11-
apt-get install -y --no-install-recommends libssl3 curl && \
10+
apt-get install -y --no-install-recommends libssl3t64 curl && \
1211
apt-get clean && \
13-
rm -rf /var/lib/apt/lists/*
12+
rm -rf /var/lib/apt/lists/*

.github/workflows/ci.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobs:
236236
needs: [ build-tests, build-tests-webrtc ]
237237
runs-on: ubuntu-24.04
238238
container:
239-
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
239+
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
240240
options: --volume debugger_data:/tmp/db
241241
env:
242242
BPF_ALIAS: /coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0
@@ -259,11 +259,10 @@ jobs:
259259
- 80:80
260260

261261
steps:
262-
- name: Install libssl3 # Our binaries are built on a newer ubuntu and require libssl3
262+
- name: Install libssl3t64 # Our binaries are built on a newer ubuntu and require libssl3t64
263263
run: |
264-
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
265264
apt-get update && \
266-
apt-get install -y --no-install-recommends libssl3 && \
265+
apt-get install -y --no-install-recommends libssl3t64 && \
267266
apt-get clean && \
268267
rm -rf /var/lib/apt/lists/*
269268
@@ -300,7 +299,7 @@ jobs:
300299
- build-tests-webrtc
301300
runs-on: ubuntu-24.04
302301
container:
303-
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
302+
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
304303
options: --volume debugger_data:/tmp/db
305304
env:
306305
# to allow local addrs discovery
@@ -340,11 +339,10 @@ jobs:
340339
- 80:80
341340

342341
steps:
343-
- name: Install libssl3 # Our binaries are built on a newer ubuntu and require libssl3
342+
- name: Install libssl3t64 # Our binaries are built on a newer ubuntu and require libssl3t64
344343
run: |
345-
echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
346344
apt-get update && \
347-
apt-get install -y --no-install-recommends libssl3 && \
345+
apt-get install -y --no-install-recommends libssl3t64 && \
348346
apt-get clean && \
349347
rm -rf /var/lib/apt/lists/*
350348
@@ -387,7 +385,7 @@ jobs:
387385
- build-tests-webrtc
388386
runs-on: ubuntu-24.04
389387
container:
390-
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
388+
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
391389
env:
392390
# to allow local addrs discovery
393391
OPENMINA_DISCOVERY_FILTER_ADDR: false
@@ -397,11 +395,10 @@ jobs:
397395
fail-fast: false
398396

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

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
[#1158](https://github.com/o1-labs/openmina/issues/1158))
1515
- Update the CI and code to compare with the latest release 3.2.0-beta1-978866c
1616
([#1250](https://github.com/o1-labs/openmina/pull/1250)
17+
- Update the CI and code to compare with the latest release 3.2.0-beta2-939b08d
18+
([#1250](https://github.com/o1-labs/openmina/pull/1285)
1719

1820

1921
### Added

docker-compose.archive.devnet.compare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ services:
100100
condition: service_healthy
101101

102102
node-ocaml:
103-
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet
103+
image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet
104104
container_name: node-ocaml
105105
environment:
106106
MINA_CLIENT_TRUSTLIST: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16

node/testing/src/node/ocaml/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl Default for OcamlNodeTestingConfig {
2020
fn default() -> Self {
2121
Self {
2222
initial_peers: vec![],
23-
daemon_json: DaemonJson::Custom("/var/lib/coda/config_978866cd.json".to_owned()),
23+
daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()),
2424
block_producer: None,
2525
}
2626
}
@@ -131,7 +131,7 @@ impl OcamlNodeConfig {
131131
impl OcamlNodeExecutable {
132132
// pub const DEFAULT_DOCKER_IMAGE: &'static str = "vladsimplestakingcom/mina-light:2.0.0rampup4";
133133
pub const DEFAULT_DOCKER_IMAGE: &'static str =
134-
"gcr.io/o1labs-192920/mina-daemon:3.2.0-beta1-978866c-bullseye-devnet";
134+
"gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet";
135135
pub const DEFAULT_MINA_EXECUTABLE: &'static str = "mina";
136136

137137
fn docker_container_name(tmp_dir: &temp_dir::TempDir) -> String {

node/testing/src/node/ocaml/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ fn run_ocaml() {
411411
graphql_port: 3086,
412412
client_port: 8301,
413413
initial_peers: Vec::new(),
414-
daemon_json: DaemonJson::Custom("/var/lib/coda/config_978866cd.json".to_owned()),
414+
daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()),
415415
block_producer: None,
416416
})
417417
.unwrap();

node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl MultiNodeBasicConnectivityPeerDiscovery {
3434

3535
let ocaml_seed_config = OcamlNodeTestingConfig {
3636
initial_peers: Vec::new(),
37-
daemon_json: DaemonJson::Custom("/var/lib/coda/config_978866cd.json".to_owned()),
37+
daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()),
3838
block_producer: None,
3939
};
4040

node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl SoloNodeBasicConnectivityAcceptIncoming {
108108
let node_id = runner.add_ocaml_node(OcamlNodeTestingConfig {
109109
initial_peers: vec![node_addr.clone()],
110110
daemon_json: DaemonJson::Custom(
111-
"/var/lib/coda/config_978866cd.json".to_owned(),
111+
"/var/lib/coda/config_939b08d8.json".to_owned(),
112112
),
113113
block_producer: None,
114114
});

0 commit comments

Comments
 (0)