Skip to content

go.mod: github.com/cilium/ebpf v0.4.0#2875

Merged
cyphar merged 1 commit intoopencontainers:masterfrom
thaJeztah:bump_ebpf
Apr 3, 2021
Merged

go.mod: github.com/cilium/ebpf v0.4.0#2875
cyphar merged 1 commit intoopencontainers:masterfrom
thaJeztah:bump_ebpf

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Mar 26, 2021

@kolyshkin
Copy link
Copy Markdown
Contributor

kolyshkin commented Mar 26, 2021

Seems they've renamed readme.md to README.md

make: *** [Makefile:134: verify-dependencies] Error 1
 HEAD detached at pull/2875/merge
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	deleted:    vendor/github.com/cilium/ebpf/readme.md

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	vendor/github.com/cilium/ebpf/README.md

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 26, 2021

Argh; will probably have to redo this from my case-sensitive partition.

I saw they mentioned breaking changes; doesn't look to be in the parts we use, but thought it would be good to at least test in some repositories if we can update

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 27, 2021

ok, looks like git config core.ignorecase false does the trick as well (as macOS is case-preserving, so with that enabled it also picks up the change in case only 🎉 ) 👍

@thaJeztah thaJeztah marked this pull request as ready for review March 27, 2021 17:18
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 27, 2021

Of course; that fixed it locally for me, but not in CI; added a commit that adds a .gitconfig to this repository, and hope that that's picked up by CI

@thaJeztah thaJeztah mentioned this pull request Mar 27, 2021
Merged
@AkihiroSuda AkihiroSuda reopened this Mar 28, 2021
AkihiroSuda
AkihiroSuda previously approved these changes Mar 28, 2021
View reviewed changes
kolyshkin
kolyshkin reviewed Mar 29, 2021
View reviewed changes
.gitconfig Outdated
@@ -0,0 +1,2 @@
[core]
ignorecase = false
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin Mar 29, 2021

Choose a reason for hiding this comment

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

Hmm... wonder why this needs to be set to false explicitly, if this is the default; git-config(1) says:

The default is false, except git-clone(1) or git-init(1) will probe and set core.ignoreCase true if appropriate when the repository is created.

Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Mar 29, 2021

Choose a reason for hiding this comment

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

Could the "where appropriate" be the issue when it detects a case-insensitive platform?

Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Mar 29, 2021

Choose a reason for hiding this comment

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

I could try reverting the commit to see if it was just coincidence that it passed after I added it? idk

Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin Apr 1, 2021

Choose a reason for hiding this comment

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

If this helps devs using Mac OS X I'm fine with the change as it is.

Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Apr 2, 2021

Choose a reason for hiding this comment

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

No it didn't change my local configuration, and I'm even in doubt now if GitHub actually uses the file, or that it was sheer luck that pushing again solved the Windows linter; I rebased, and removed the commit to confirm that suspicion

@kolyshkin
Copy link
Copy Markdown
Contributor

kolyshkin commented Apr 1, 2021

Needs a rebase @thaJeztah

@thaJeztah
go.mod: github.com/cilium/ebpf v0.4.0
4812517 
full diff: cilium/ebpf@v0.2.0...v0.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah requested a review from kolyshkin April 2, 2021 08:46
This was referenced Apr 2, 2021
Closed
Closed
cyphar
cyphar approved these changes Apr 3, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

LGTM.

@cyphar cyphar closed this in b85373f Apr 3, 2021
@cyphar cyphar merged commit b85373f into opencontainers:master Apr 3, 2021
@thaJeztah thaJeztah deleted the bump_ebpf branch April 3, 2021 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cyphar cyphar cyphar approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@kolyshkin kolyshkin Awaiting requested review from kolyshkin

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @kolyshkin @cyphar @AkihiroSuda