Skip to content

Commit

Permalink
Mitigate tag name collision
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtelvers
mtelvers committed May 16, 2024
1 parent f924684 commit 59a1975
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
44 changes: 22 additions & 22 deletions builds.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20941,7 +20941,7 @@ windows-mingw-ltsc2019/amd64
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.14-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.14-amd64 -> ocaml/opam:windows-mingw-ocaml-4.14
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.14-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.14-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.14
4.13.1/amd64
# escape=`

Expand All @@ -20966,7 +20966,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.14-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.13-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.13-amd64 -> ocaml/opam:windows-mingw-ocaml-4.13
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.13-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.13-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.13
4.12.1/amd64
# escape=`

Expand All @@ -20991,7 +20991,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.13-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.12-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.12-amd64 -> ocaml/opam:windows-mingw-ocaml-4.12
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.12-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.12-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.12
4.11.2/amd64
# escape=`

Expand All @@ -21016,7 +21016,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.12-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.11-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.11-amd64 -> ocaml/opam:windows-mingw-ocaml-4.11
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.11-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.11-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.11
4.10.2/amd64
# escape=`

Expand All @@ -21041,7 +21041,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.11-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.10-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.10-amd64 -> ocaml/opam:windows-mingw-ocaml-4.10
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.10-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.10-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.10
4.09.1/amd64
# escape=`

Expand All @@ -21066,7 +21066,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.10-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.09-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.09-amd64 -> ocaml/opam:windows-mingw-ocaml-4.09
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.09-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.09-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.09
4.08.1/amd64
# escape=`

Expand All @@ -21091,7 +21091,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.09-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.08-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.08-amd64 -> ocaml/opam:windows-mingw-ocaml-4.08
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.08-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.08-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.08
4.07.1/amd64
# escape=`

Expand All @@ -21116,7 +21116,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.08-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.07-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.07-amd64 -> ocaml/opam:windows-mingw-ocaml-4.07
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.07-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.07-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.07
4.06.1/amd64
# escape=`

Expand All @@ -21141,7 +21141,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.07-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.06-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.06-amd64 -> ocaml/opam:windows-mingw-ocaml-4.06
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.06-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.06-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.06
4.05.0/amd64
# escape=`

Expand All @@ -21166,7 +21166,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.06-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.05-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.05-amd64 -> ocaml/opam:windows-mingw-ocaml-4.05
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.05-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.05-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.05
4.04.2/amd64
# escape=`

Expand All @@ -21191,7 +21191,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.05-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.04-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.04-amd64 -> ocaml/opam:windows-mingw-ocaml-4.04
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.04-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.04-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.04
4.03.0/amd64
# escape=`

Expand All @@ -21216,7 +21216,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.04-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.03-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.03-amd64 -> ocaml/opam:windows-mingw-ocaml-4.03
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.03-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.03-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.03
4.02.3/amd64
# escape=`

Expand All @@ -21241,7 +21241,7 @@ ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.03-amd64, ocurrent/o
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.02-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.02-amd64 -> ocaml/opam:windows-mingw-ocaml-4.02
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.02-amd64, ocurrent/opam-staging:windows-mingw-ltsc2019-ocaml-4.02-amd64 -> ocaml/opam:windows-all-mingw-ocaml-4.02
ocurrent/opam-staging:windows-server-mingw-ltsc2022-opam-amd64 -> ocaml/opam:windows-server-mingw-ltsc2022-opam
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.02-amd64 -> ocaml/opam:windows-server-mingw-ltsc2022-ocaml-4.02
ocurrent/opam-staging:windows-server-mingw-ltsc2022-ocaml-4.02-amd64 -> ocaml/opam:windows-server-mingw-ocaml-4.02
Expand Down Expand Up @@ -21495,7 +21495,7 @@ windows-msvc-ltsc2019/amd64
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.14-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.14-amd64 -> ocaml/opam:windows-msvc-ocaml-4.14
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.14-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.14-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.14
4.13.1/amd64
# escape=`

Expand All @@ -21520,7 +21520,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.14-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.13-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.13-amd64 -> ocaml/opam:windows-msvc-ocaml-4.13
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.13-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.13-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.13
4.12.1/amd64
# escape=`

Expand All @@ -21545,7 +21545,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.13-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.12-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.12-amd64 -> ocaml/opam:windows-msvc-ocaml-4.12
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.12-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.12-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.12
4.11.2/amd64
# escape=`

Expand All @@ -21570,7 +21570,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.12-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.11-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.11-amd64 -> ocaml/opam:windows-msvc-ocaml-4.11
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.11-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.11-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.11
4.10.2/amd64
# escape=`

Expand All @@ -21595,7 +21595,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.11-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.10-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.10-amd64 -> ocaml/opam:windows-msvc-ocaml-4.10
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.10-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.10-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.10
4.09.1/amd64
# escape=`

Expand All @@ -21620,7 +21620,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.10-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.09-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.09-amd64 -> ocaml/opam:windows-msvc-ocaml-4.09
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.09-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.09-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.09
4.08.1/amd64
# escape=`

Expand All @@ -21645,7 +21645,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.09-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.08-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.08-amd64 -> ocaml/opam:windows-msvc-ocaml-4.08
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.08-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.08-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.08
4.07.1/amd64
# escape=`

Expand All @@ -21670,7 +21670,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.08-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.07-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.07-amd64 -> ocaml/opam:windows-msvc-ocaml-4.07
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.07-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.07-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.07
4.06.1/amd64
# escape=`

Expand All @@ -21695,7 +21695,7 @@ ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.07-amd64, ocurrent/op
CMD [ "cmd.exe" ]
COPY [ "Dockerfile", "/Dockerfile.ocaml" ]

ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.06-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.06-amd64 -> ocaml/opam:windows-msvc-ocaml-4.06
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.06-amd64, ocurrent/opam-staging:windows-msvc-ltsc2019-ocaml-4.06-amd64 -> ocaml/opam:windows-all-msvc-ocaml-4.06
ocurrent/opam-staging:windows-server-msvc-ltsc2022-opam-amd64 -> ocaml/opam:windows-server-msvc-ltsc2022-opam
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.06-amd64 -> ocaml/opam:windows-server-msvc-ltsc2022-ocaml-4.06
ocurrent/opam-staging:windows-server-msvc-ltsc2022-ocaml-4.06-amd64 -> ocaml/opam:windows-server-msvc-ocaml-4.06
Expand Down
1 change: 1 addition & 0 deletions src/pipeline.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ module Make (OCurrent : S.OCURRENT) = struct
let multiarch, pipelines = List.fold_left_map distro_pipeline Switch_map.empty distro_versions in
let pushes =
Switch_map.fold (fun switch images pushes ->
let distro_label = String.split_on_char '-' distro_label |> String.concat "-all-" in
let full_tag = Printf.sprintf "%s:%s-ocaml-%s" Conf.public_repo distro_label (Tag.tag_of_compiler switch) in
let tags =
let tags = [full_tag] in
Expand Down

0 comments on commit 59a1975

Please sign in to comment.