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

Remove use of fillGo18FileTypeBits #1652

Merged
merged 1 commit into from Jun 29, 2023
Merged

Remove use of fillGo18FileTypeBits #1652

merged 1 commit into from Jun 29, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jun 28, 2023

@rhatdan
Copy link
Member Author

rhatdan commented Jun 28, 2023

@nalind Is this what you intended?

@@ -358,7 +358,6 @@ func FileInfoHeader(name string, fi os.FileInfo, link string) (*tar.Header, erro
if err != nil {
return nil, err
}
hdr.Mode = fillGo18FileTypeBits(int64(chmodTarEntry(os.FileMode(hdr.Mode))), fi)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think hdr.Mode should still be set.

+ hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))

@flouthoc
Copy link
Collaborator

I think we should still set the mode without file and dir bits ?

-hdr.Mode = fillGo18FileTypeBits(int64(chmodTarEntry(os.FileMode(hdr.Mode))), fi)
+hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))

@rhatdan rhatdan force-pushed the mode branch 2 times, most recently from 8e3003e to 8c92ca1 Compare June 28, 2023 11:54
Fixes for containers/buildah#4772

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@nalind
Copy link
Member

nalind commented Jun 28, 2023

LGTM, but does it fix the issue?

Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @cevich would it be possible to pull this commit in the branch for running the CI ?

@cevich
Copy link
Member

cevich commented Jun 28, 2023

LGTM @cevich would it be possible to pull this commit in the branch for running the CI ?

You can manually with hack/get_ci_vm.sh <task name>, just fixup the system how you need, and run the necessary *_script: commands directly from .cirrus.yml and they should do the right thing (this is not a guarantee).

Another option is the re-run in terminal trick on an already finished branch run. I'm assuming you're talking about buildah CI? Check out https://cirrus-ci.com/github/containers/buildah/main (or replace main with whatever branch you like). Pick a recent green NON-CRON-INVOCATION job and poke away.
(the "cron-invocation" jobs are monitored)

@rhatdan rhatdan merged commit e3be3eb into containers:main Jun 29, 2023
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants