[GLUTEN-10926][VL] followup to fix docker image conflict #11064
+63
−14
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
zhouyuan
force-pushed
the
wip_vcpkg_libuuid_mirror
branch
from
ddf5c3e to
391ef99
Compare
Signed-off-by: Yuan <[email protected]>
This reverts commit f961376.
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
zhouyuan
changed the title
PHILO-HE
reviewed
Nov 12, 2025
.github/workflows/docker_image.yml
Outdated
| strategy: | ||
| matrix: | ||
| digests: [ vcpkg-centos-8, vcpkg-centos-8-gcc13, vcpkg-centos-9, centos-8-jdk8, centos-8-jdk11, centos-8-jdk17, centos-9-jdk8, centos-9-jdk11, centos-9-jdk17 ] | ||
| digests: [ vcpkg-centos-8, vcpkg-centos-8_gcc13, vcpkg-centos-9, centos-8-jdk8, centos-8-jdk11, centos-8-jdk17, centos-9-jdk8, centos-9-jdk11, centos-9-jdk17 ] |
Member
There was a problem hiding this comment.
How about creating a separate merge job for gcc13 dockers? Then, no impact due to the name pattern conflict.
I feel it may be better to keep the naming consistency with hyphen as separator.
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
This reverts commit 2005d95.
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
Signed-off-by: Yuan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes are proposed in this pull request?
after #10926 the docker image for vcpkg-centos-8 has a conlict with vcpkg-centos-8-gcc13 when merging digests.
this patch renames the merge pattern so there is not conflict.
How was this patch tested?
Related issue: #10926