Skip to content

Commit 93c99f1

Browse files
authored
Merge pull request #17858 from MinaProtocol/lyh/bump-opam-export
bump various dependencies to fix nix build test
2 parents 90ff48c + 7ff429c commit 93c99f1

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

README-dev.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ A number of C libraries are expected to be available in the system and are also
150150
If you use vim, add this snippet in your `.vimrc` file to use Merlin. (Note:Be sure to change the HOME directory to match yours.)
151151

152152
```bash
153-
let s:ocamlmerlin="/Users/USERNAME/.opam/4.14.0/share/merlin"
153+
let s:ocamlmerlin="/Users/USERNAME/.opam/4.14.2/share/merlin"
154154
execute "set rtp+=".s:ocamlmerlin."/vim"
155155
execute "set rtp+=".s:ocamlmerlin."/vimbufsync"
156156
let g:syntastic_ocaml_checkers=['merlin']
@@ -301,10 +301,10 @@ We use the [Dune](https://github.com/ocaml/dune/) build system for OCaml code.
301301
302302
OCaml dependencies live in the [`opam.export`](./opam.export) file. This file is machine generated and must not be modified.
303303
304-
To add a new dependency, you most likely will need to create a new fresh switch to avoid pushing in any local dependency (like `ocaml-lsp`). The following commands assume that the version of the OCaml compiler used in the codebase is 4.14.0:
304+
To add a new dependency, you most likely will need to create a new fresh switch to avoid pushing in any local dependency (like `ocaml-lsp`). The following commands assume that the version of the OCaml compiler used in the codebase is 4.14.2:
305305
306306
```shell
307-
opam switch create mina_fresh 4.14.0
307+
opam switch create mina_fresh 4.14.2
308308
opam switch import opam.export
309309
```
310310

buildkite/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ check_syntax:
55
find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" && dhall --file {} > /dev/null || exit 255'
66

77
check_lint:
8+
@echo "Dhall version: $$(dhall --version)"
89
find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" && dhall --ascii lint --check --inplace {} || exit 255'
910

1011
check_format:
12+
@echo "Dhall version: $$(dhall --version)"
1113
find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{} format" && dhall --ascii format --check --inplace {} || exit 255'
1214

1315
lint:

buildkite/src/Constants/ContainerImages.dhall

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
-- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
55
{ toolchainBase = "codaprotocol/ci-toolchain-base:v3"
66
, minaToolchainBookworm =
7-
{ arm64 =
8-
"gcr.io/o1labs-192920/mina-toolchain@sha256:a3cb75816eb1969b23633002eaf60d029ceb57ef6c948457a6860ba89ebc0d11"
9-
, amd64 =
10-
"gcr.io/o1labs-192920/mina-toolchain@sha256:94cd586905888a36c2340abf92edae991ffce4006285e6ce034129d0e33ab396"
7+
{ amd64 =
8+
"gcr.io/o1labs-192920/mina-toolchain@sha256:0c2764790ae18788b97a9c6361d7c4b0a96c515d176226868d929415e24f8251"
9+
, arm64 =
10+
"gcr.io/o1labs-192920/mina-toolchain@sha256:deb63964399029d681e39ac4ff529616b179c72fff3a0ab350e11a7099f6f23d"
1111
}
1212
, minaToolchainBullseye.amd64 =
13-
"gcr.io/o1labs-192920/mina-toolchain@sha256:29998364d3130215501f085ba4d99a3fc2474d1975eef67b67af8b7e65e0f01f"
13+
"gcr.io/o1labs-192920/mina-toolchain@sha256:db00940ea2c778592a520da755388014231db52aa2d89e0c853abfafc4fa5846"
1414
, minaToolchainNoble =
15-
{ arm64 =
16-
"gcr.io/o1labs-192920/mina-toolchain@sha256:4c0dc9e90fd5919e91d8228bff76e205b5fa83d32723f305fca062480dd77080"
17-
, amd64 =
18-
"gcr.io/o1labs-192920/mina-toolchain@sha256:be93e47598f24b2c364a52bb0546eecf60eab146084b2b6ab373bfb7ef066c0e"
15+
{ amd64 =
16+
"gcr.io/o1labs-192920/mina-toolchain@sha256:669c4053d2f3b7ecf5787b9dc0d908b7061c8a8908dcc766c4de57bcd1c67fa1"
17+
, arm64 =
18+
"gcr.io/o1labs-192920/mina-toolchain@sha256:2a71e234ca0cc42a663e42daabef3736207fd91bac414b2d511b30b336529b74"
1919
}
2020
, minaToolchainJammy.amd64 =
21-
"gcr.io/o1labs-192920/mina-toolchain@sha256:4fe3d9a17af3177f1e4c549a0c014fc4ef376731848dbb6066cc2a7413b75c5a"
21+
"gcr.io/o1labs-192920/mina-toolchain@sha256:b16023b65bb90fc2242c83b7c9f3f3c62aca521f316a16a45f5f7cb115e95f15"
2222
, minaToolchain =
23-
"gcr.io/o1labs-192920/mina-toolchain@sha256:29998364d3130215501f085ba4d99a3fc2474d1975eef67b67af8b7e65e0f01f"
23+
"gcr.io/o1labs-192920/mina-toolchain@sha256:db00940ea2c778592a520da755388014231db52aa2d89e0c853abfafc4fa5846"
2424
, postgres = "postgres:12.4-alpine"
2525
, xrefcheck =
2626
"dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

opam.export

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ roots: [
4848
"qcheck.0.20"
4949
"qcheck-alcotest.0.20"
5050
"re2.v0.14.0"
51-
"rocks.0.1.1"
52-
"rocksdb_stubs.5.17.2"
51+
"rocks.0.2.0"
52+
"rocksdb_stubs.10.2.1"
5353
"rpc_parallel.v0.14.0"
5454
"sexp_diff_kernel.v0.14.0"
5555
"sodium.dev"
@@ -180,7 +180,7 @@ installed: [
180180
"num.1.1"
181181
"ocaml.4.14.2"
182182
"ocaml-base-compiler.4.14.2"
183-
"ocaml-compiler-libs.v0.12.3"
183+
"ocaml-compiler-libs.v0.12.4"
184184
"ocaml-config.2"
185185
"ocaml-migrate-parsetree.2.3.0"
186186
"ocaml-options-vanilla.1"
@@ -249,8 +249,8 @@ installed: [
249249
"react.1.2.1"
250250
"res.5.0.1"
251251
"result.1.5"
252-
"rocks.0.1.1"
253-
"rocksdb_stubs.5.17.2"
252+
"rocks.0.2.0"
253+
"rocksdb_stubs.10.2.1"
254254
"rpc_parallel.v0.14.0"
255255
"rresult.0.6.0"
256256
"seq.base"

0 commit comments

Comments
 (0)