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

Jump to bottom

conftest: 0.7.0 -> 0.12.0 #68438

Merged
merged 1 commit into from Sep 12, 2019
Merged

conftest: 0.7.0 -> 0.12.0 #68438

merged 1 commit into from Sep 12, 2019

Conversation

rvolosatovs
Copy link
Member

Motivation for this change

Upstream update
Blocks #68135

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @yurrriq

@rvolosatovs
Copy link
Member Author

@GrahamcOfBorg build conftest

@rvolosatovs rvolosatovs mentioned this pull request Sep 10, 2019
Merged
10 tasks
@rvolosatovs
Copy link
Member Author

rvolosatovs commented Sep 10, 2019 •
edited

Maybe depending on a patch based on PR URL was not the best idea - I will use a single commit in my fork instead Added the patch as a checked-in file

@rvolosatovs
Copy link
Member Author

Refs open-policy-agent/conftest#85

@ofborg ofborg bot requested review from kalbasit and yurrriq September 10, 2019 18:45
@rvolosatovs rvolosatovs changed the title conftest: 0.7.0 -> 0.12.0 [WIP] conftest: 0.7.0 -> 0.12.0 Sep 10, 2019
@rvolosatovs rvolosatovs changed the title [WIP] conftest: 0.7.0 -> 0.12.0 conftest: 0.7.0 -> 0.12.0 Sep 10, 2019
@rvolosatovs
Copy link
Member Author

@GrahamcOfBorg build conftest

yurrriq
yurrriq approved these changes Sep 10, 2019
View reviewed changes
Copy link
Member

@yurrriq yurrriq left a comment

Choose a reason for hiding this comment

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

LGTM thanks!

@ofborg ofborg bot requested a review from yurrriq September 10, 2019 20:12
@Mic92
Copy link
Member

Mic92 commented Sep 11, 2019

@GrahamcOfBorg build conftest

Mic92
Mic92 reviewed Sep 11, 2019
View reviewed changes
pkgs/development/tools/conftest/default.nix
patches = [
# Version 0.12.0 does not build with go 1.13. See https://github.com/instrumenta/conftest/pull/85.
# TODO: Remove once https://github.com/instrumenta/conftest/pull/85 is merged and lands in a release.
./go-1.13-deps.patch
Copy link
Member

@Mic92 Mic92 Sep 11, 2019 •
edited

Choose a reason for hiding this comment

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

I assume this patch differs from, so you cannot use i.e. fetchpatch? https://github.com/instrumenta/conftest/commit/e8494d819585452e501728a364e31d38100136de.patch

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, initially it was the same, but @jpreese asked for more changes, including dependency update. IMO this is too much to add onto the 0.12.0 and can potentially change behavior - the proposed patch is the bare minimum to make the 0.12.0 version build on go 1.13

Copy link
Member Author

Choose a reason for hiding this comment

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

You can see that the proposed patch keeps dependency hashes intact (apart from xerrors, since the version dependent on is incompatible with go 1.13)

@Mic92
Copy link
Member

Mic92 commented Sep 11, 2019

I get a different checksum for the go modules:
conftest.log

@lheckemann lheckemann added this to the 20.03 milestone Sep 12, 2019
@rvolosatovs
Copy link
Member Author

@GrahamcOfBorg build conftest

@yurrriq
Copy link
Member

yurrriq commented Sep 12, 2019

@Mic92 Mildly related: I sometime have issues where my local machine comes up with different hashes from e.g. Travis. Any idea what might cause that? I have a somewhat elaborate set up with various overlays and such, so it's a bit tricky for me to try to track down the root cause. Any hints would be greatly appreciated.

@ofborg ofborg bot requested a review from yurrriq September 12, 2019 15:44
@Mic92 Mic92 merged commit bfecc8d into NixOS:master Sep 12, 2019
@rvolosatovs rvolosatovs deleted the update/conftest branch September 12, 2019 16:24
@Mic92
Copy link
Member

Mic92 commented Sep 12, 2019

@yurrriq I have not seen this with golang in particular. One recurring issue I saw, is that macOS used a case-insensitive filesystem (HFS+). If you have derivation produced by programs like go/cargo it could also depend on the program's version - which would be a bug of our fetcher in that case.

@yurrriq
Copy link
Member

yurrriq commented Sep 13, 2019

Yeah, it's not specific to golang for me either, I don't think. I'm on NixOS, by the way. Here's an example with renderizer: https://travis-ci.org/yurrriq/nur-packages/builds/572301956

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@kalbasit kalbasit Awaiting requested review from kalbasit

@yurrriq yurrriq Awaiting requested review from yurrriq

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rvolosatovs @Mic92 @yurrriq @lheckemann