Skip to content

Commit a87ee15

Browse files
mtelversmtelvers
committed
Add opam-2.5 to base images
1 parent 6868ff7 commit a87ee15

File tree

6 files changed

+3839
-5197
lines changed

6 files changed

+3839
-5197
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1414
libssl-dev \
1515
m4 \
1616
pkg-config
17-
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1abfcdbf14f12a32c14d0d6e078d94634fdcc07a && opam update
17+
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 3e41859015888fe8240e84dfc5f31bfa12a557e8 && opam update
1818
COPY --chown=opam --link base-images.opam /src/
1919
WORKDIR /src
2020
RUN --mount=type=cache,target=/home/opam/.opam/download-cache,sharing=locked,uid=1000,gid=1000 \

‎builds.expected‎

Lines changed: 3822 additions & 5195 deletions
Large diffs are not rendered by default.

‎src/dump.ml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ let run () =
123123
opam_2_2 = Current_git.Commit_id.v ~repo:"opam" ~gref:"2.2" ~hash:"2.2";
124124
opam_2_3 = Current_git.Commit_id.v ~repo:"opam" ~gref:"2.3" ~hash:"2.3";
125125
opam_2_4 = Current_git.Commit_id.v ~repo:"opam" ~gref:"2.4" ~hash:"2.4";
126+
opam_2_5 = Current_git.Commit_id.v ~repo:"opam" ~gref:"2.5" ~hash:"2.5";
126127
opam_master = Current_git.Commit_id.v ~repo:"opam" ~gref:"master" ~hash:"master";
127128
} in
128129
(* The version numbers given below are correct as of April 2024. They do not need to be updated and serve only as static

‎src/git_repositories.ml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module Repositories = struct
2323
opam_2_2 : repo;
2424
opam_2_3 : repo;
2525
opam_2_4 : repo;
26+
opam_2_5 : repo;
2627
opam_master : repo;
2728
}
2829

@@ -35,6 +36,7 @@ module Repositories = struct
3536
opam_2_2;
3637
opam_2_3;
3738
opam_2_4;
39+
opam_2_5;
3840
opam_master;
3941
} =
4042
let json = `Assoc [
@@ -46,6 +48,7 @@ module Repositories = struct
4648
"opam__2.2", `String opam_2_2;
4749
"opam__2.3", `String opam_2_3;
4850
"opam__2.4", `String opam_2_4;
51+
"opam__2.5", `String opam_2_5;
4952
"opam__master", `String opam_master;
5053
] in
5154
Yojson.Safe.to_string json
@@ -63,6 +66,7 @@ module Repositories = struct
6366
opam_2_2 : hash;
6467
opam_2_3 : hash;
6568
opam_2_4 : hash;
69+
opam_2_5 : hash;
6670
opam_master : hash;
6771
} [@@deriving yojson]
6872

@@ -107,6 +111,7 @@ module Repositories = struct
107111
opam_2_2;
108112
opam_2_3;
109113
opam_2_4;
114+
opam_2_5;
110115
opam_master
111116
} =
112117
Metrics.set_last_build_time_now ();
@@ -119,6 +124,7 @@ module Repositories = struct
119124
get_commit_hash ~job ~repo:opam_2_2 ~branch:"2.2" >>!= fun opam_2_2 ->
120125
get_commit_hash ~job ~repo:opam_2_3 ~branch:"2.3" >>!= fun opam_2_3 ->
121126
get_commit_hash ~job ~repo:opam_2_4 ~branch:"2.4" >>!= fun opam_2_4 ->
127+
get_commit_hash ~job ~repo:opam_2_5 ~branch:"2.5" >>!= fun opam_2_5 ->
122128
get_latest_release_hash ~job ~repo:opam_master >>!= fun opam_master ->
123129
let repos = { Value.opam_repository_master;
124130
opam_repository_mingw_sunset;
@@ -128,6 +134,7 @@ module Repositories = struct
128134
opam_2_2;
129135
opam_2_3;
130136
opam_2_4;
137+
opam_2_5;
131138
opam_master
132139
}
133140
in
@@ -149,6 +156,7 @@ type t = {
149156
opam_2_2 : Current_git.Commit_id.t;
150157
opam_2_3 : Current_git.Commit_id.t;
151158
opam_2_4 : Current_git.Commit_id.t;
159+
opam_2_5 : Current_git.Commit_id.t;
152160
opam_master : Current_git.Commit_id.t;
153161
}
154162

@@ -163,9 +171,10 @@ let get ~schedule =
163171
opam_2_2 = "https://github.com/ocaml/opam";
164172
opam_2_3 = "https://github.com/ocaml/opam";
165173
opam_2_4 = "https://github.com/ocaml/opam";
174+
opam_2_5 = "https://github.com/ocaml/opam";
166175
opam_master = "https://github.com/ocaml/opam";
167176
} in
168-
let+ {Repositories.Value.opam_repository_master; opam_repository_mingw_sunset; opam_overlays; opam_2_0; opam_2_1; opam_2_2; opam_2_3; opam_2_4; opam_master} =
177+
let+ {Repositories.Value.opam_repository_master; opam_repository_mingw_sunset; opam_overlays; opam_2_0; opam_2_1; opam_2_2; opam_2_3; opam_2_4; opam_2_5; opam_master} =
169178
Current.component "Git-repositories" |>
170179
let> key = Current.return key in
171180
Cache.get ~schedule Repositories.No_context key
@@ -187,6 +196,8 @@ let get ~schedule =
187196
Current_git.Commit_id.v ~repo:key.opam_2_3 ~gref:"2.3" ~hash:opam_2_3;
188197
opam_2_4 =
189198
Current_git.Commit_id.v ~repo:key.opam_2_4 ~gref:"2.4" ~hash:opam_2_4;
199+
opam_2_5 =
200+
Current_git.Commit_id.v ~repo:key.opam_2_5 ~gref:"2.5" ~hash:opam_2_5;
190201
opam_master =
191202
Current_git.Commit_id.v ~repo:key.opam_master ~gref:"master" ~hash:opam_master;
192203
}

‎src/git_repositories.mli‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ type t = {
77
opam_2_2 : Current_git.Commit_id.t;
88
opam_2_3 : Current_git.Commit_id.t;
99
opam_2_4 : Current_git.Commit_id.t;
10+
opam_2_5 : Current_git.Commit_id.t;
1011
opam_master : Current_git.Commit_id.t;
1112
}
1213

‎src/pipeline.ml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ module Make (OCurrent : S.OCURRENT) = struct
156156
opam_2_2;
157157
opam_2_3;
158158
opam_2_4;
159+
opam_2_5;
159160
opam_master
160161
} = repos
161162
and> windows_version = windows_version in
@@ -166,6 +167,7 @@ module Make (OCurrent : S.OCURRENT) = struct
166167
opam_2_2_hash = Current_git.Commit_id.hash opam_2_2;
167168
opam_2_3_hash = Current_git.Commit_id.hash opam_2_3;
168169
opam_2_4_hash = Current_git.Commit_id.hash opam_2_4;
170+
opam_2_5_hash = Current_git.Commit_id.hash opam_2_5;
169171
opam_master_hash = Current_git.Commit_id.hash opam_master;
170172
} in
171173
`Contents (

0 commit comments

Comments
 (0)