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

ofborg: pass rev #442

Merged
merged 2 commits into from Mar 30, 2020
Merged

ofborg: pass rev #442

merged 2 commits into from Mar 30, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Mar 29, 2020

Hydra seems to have passed in rev all the time, and nixpkgs will soon
require rev to be set.

This initially broke nixpkgs eval in
NixOS/nixpkgs@5e8545e,
so we now update ofborg to always pass rev when instantiating nixpkgs
to avoid breaking it.

Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
NixOS/nixpkgs@5e8545e,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
Here, we can easily access the real commit ID, so pass it in instead of
a bogus rev and shortRev.

Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
NixOS/nixpkgs@5e8545e,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
"{{ outPath=./.; revCount=999999; shortRev=\"{}\"; rev=\"{}\"; }}",
&self.job.pr.head_sha[0..7],
&self.job.pr.head_sha,
);
Copy link
Member

Choose a reason for hiding this comment

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

wow you're getting fancy here with the head_sha stuff :P

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, at least here it's easy to get it, so we can very well pass in the proper value.

@grahamc grahamc merged commit 33258c1 into NixOS:released Mar 30, 2020
@flokli flokli deleted the ofborg-pass-rev branch March 30, 2020 14:11
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

2 participants