Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

util/archutil: re-generate to fix validation for mips64 #5370

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

thaJeztah
Copy link
Member

validation was failing; not sure what introduced it though;

 > [validate 1/1] RUN --mount=type=bind,target=.,rw     --mount=type=bind,from=generate,source=/out,target=/generated-files <<EOT (set -e...):
0.379 ERROR: The result of archutil differs. Please update with "make archutil"
0.379  M util/archutil/mips64_binary.go
0.379  M util/archutil/mips64le_binary.go
------
archutil.Dockerfile:116
--------------------
 115 |     FROM base AS validate
 116 | >>> RUN --mount=type=bind,target=.,rw \
 117 | >>>     --mount=type=bind,from=generate,source=/out,target=/generated-files <<EOT
 118 | >>>   set -e
 119 | >>>   git add -A
 120 | >>>   if [ "$(ls -A /generated-files)" ]; then
 121 | >>>     cp -rf /generated-files/* ./util/archutil
 122 | >>>   fi
 123 | >>>   diff=$(git status --porcelain -- util/archutil)
 124 | >>>   if [ -n "$diff" ]; then
 125 | >>>     echo >&2 'ERROR: The result of archutil differs. Please update with "make archutil"'
 126 | >>>     echo "$diff"
 127 | >>>     exit 1
 128 | >>>   fi
 129 | >>> EOT
 130 |
--------------------
ERROR: failed to solve: process "/bin/sh -c   set -e\n  git add -A\n  if [ \"$(ls -A /generated-files)\" ]; then\n    cp -rf /generated-files/* ./util/archutil\n  fi\n  diff=$(git status --porcelain -- util/archutil)\n  if [ -n \"$diff\" ]; then\n    echo >&2 'ERROR: The result of archutil differs. Please update with \"make archutil\"'\n    echo \"$diff\"\n    exit 1\n  fi\n" did not complete successfully: exit code: 1

validation was failing; not sure what introduced it though;

     > [validate 1/1] RUN --mount=type=bind,target=.,rw     --mount=type=bind,from=generate,source=/out,target=/generated-files <<EOT (set -e...):
    0.379 ERROR: The result of archutil differs. Please update with "make archutil"
    0.379  M util/archutil/mips64_binary.go
    0.379  M util/archutil/mips64le_binary.go
    ------
    archutil.Dockerfile:116
    --------------------
     115 |     FROM base AS validate
     116 | >>> RUN --mount=type=bind,target=.,rw \
     117 | >>>     --mount=type=bind,from=generate,source=/out,target=/generated-files <<EOT
     118 | >>>   set -e
     119 | >>>   git add -A
     120 | >>>   if [ "$(ls -A /generated-files)" ]; then
     121 | >>>     cp -rf /generated-files/* ./util/archutil
     122 | >>>   fi
     123 | >>>   diff=$(git status --porcelain -- util/archutil)
     124 | >>>   if [ -n "$diff" ]; then
     125 | >>>     echo >&2 'ERROR: The result of archutil differs. Please update with "make archutil"'
     126 | >>>     echo "$diff"
     127 | >>>     exit 1
     128 | >>>   fi
     129 | >>> EOT
     130 |
    --------------------
    ERROR: failed to solve: process "/bin/sh -c   set -e\n  git add -A\n  if [ \"$(ls -A /generated-files)\" ]; then\n    cp -rf /generated-files/* ./util/archutil\n  fi\n  diff=$(git status --porcelain -- util/archutil)\n  if [ -n \"$diff\" ]; then\n    echo >&2 'ERROR: The result of archutil differs. Please update with \"make archutil\"'\n    echo \"$diff\"\n    exit 1\n  fi\n" did not complete successfully: exit code: 1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@crazy-max crazy-max merged commit 9cdd15e into moby:master Sep 30, 2024
91 checks passed
@thaJeztah thaJeztah deleted the fix_archutil branch September 30, 2024 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants