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.

Sign up for GitHub

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

Nix fixes - 1.35 #4778

Merged
merged 12 commits into from
Jan 24, 2023
Merged

Nix fixes - 1.35 #4778

merged 12 commits into from
Jan 24, 2023

Conversation

jbgi
Copy link
Contributor

@jbgi jbgi commented Jan 12, 2023

this is a backport of #4748.

@jbgi jbgi force-pushed the nix-caching-improvements-1.35 branch 3 times, most recently from 196021d to a200ca8 Compare January 12, 2023 21:57
@jbgi jbgi force-pushed the nix-caching-improvements-1.35 branch 3 times, most recently from f404a29 to 262677a Compare January 18, 2023 13:45
@jbgi jbgi requested a review from coot as a code owner January 18, 2023 13:45
@jbgi
Copy link
Contributor Author

jbgi commented Jan 18, 2023

bors try

iohk-bors bot added a commit that referenced this pull request Jan 18, 2023
@iohk-bors
Try #4778:
d431f32
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 18, 2023

try

Build succeeded:

@dermetfan dermetfan mentioned this pull request Jan 19, 2023
Closed
@jbgi
nix: optimize caching by delaying setGitRev
5190503 
 other simplification/optimization:
  - remove generated project-packages-exes.nix (now at eval time)
  - move rewrite-libs to binary-release.nix: not needed and faster for normal builds
  - use haskell.nix project overlays to simplify access to components and alternative projects config (profiled, etc.).
  - filter src to avoid rebuilds for test that depends on $CARDANO_NODE_SRC
@jbgi
bump iohkNix to include libsodium fix for mingwW64
84969da
@jbgi
fix required jobs, rename systemHydraJobs to ciJobs.
1354c69
@jbgi
switch bors to use ci/required
fb2bd2e
@jbgi
haskell.nix: add some TODO regarding unwanted dependencies on src.
e6f8db8 
 also for profiled project, activate profiling for all exes to avoid surprises
@jbgi
Update plutus-apps
52567bb 
 fix issue when entering `nix develop .#devops`:

 ```
 error: the path '~/.gitconfig' can not be resolved in pure mode

       … while evaluating the attribute 'gitignoreFilter'
 ```
@jbgi
node nixos service: fix path of profiled, eventlogged and asserted bi…
4563033 
…naries
@jbgi
fix index-state and version of tools to avoid rebuilds and compile er…
94fbab4 
…rors
@jbgi jbgi force-pushed the nix-caching-improvements-1.35 branch from 914763b to 9f8a932 Compare January 24, 2023 09:17
@jbgi jbgi force-pushed the nix-caching-improvements-1.35 branch from b28521d to d992b72 Compare January 24, 2023 10:00
@jbgi
Copy link
Contributor Author

jbgi commented Jan 24, 2023

bors try

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

try

Already running a review

@jbgi jbgi changed the title Nix caching improvements - 1.35 Nix fixes - 1.35 Jan 24, 2023
@jbgi
Copy link
Contributor Author

jbgi commented Jan 24, 2023

bors try-

@jbgi
Copy link
Contributor Author

jbgi commented Jan 24, 2023

bors try

iohk-bors bot added a commit that referenced this pull request Jan 24, 2023
@iohk-bors
Try #4778:
f4b9d7f
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

try

Build failed:

@coot @jbgi
Use hedgehog-extras-0.2.0.0
7d64f79 
This works for both `nix` and `cabal`.
@jbgi
Copy link
Contributor Author

jbgi commented Jan 24, 2023

bors try

iohk-bors bot added a commit that referenced this pull request Jan 24, 2023
@iohk-bors
Try #4778:
68c5f62
@disassembler
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Jan 24, 2023
@iohk-bors @jbgi
@newhoggy @coot
Merge #4778
8979232 
4778: Nix fixes - 1.35 r=disassembler a=jbgi

this is a backport of #4748.

Co-authored-by: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Co-authored-by: John Ky <john.ky@iohk.io>
Co-authored-by: Marcin Szamotulski <coot@coot.me>
@disassembler
Copy link
Contributor

boors r-

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

try

Timed out.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

Timed out.

@disassembler
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Jan 24, 2023
@iohk-bors @jbgi
@newhoggy @coot
Merge #4778
a271837 
4778: Nix fixes - 1.35 r=disassembler a=jbgi

this is a backport of #4748.

Co-authored-by: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Co-authored-by: John Ky <john.ky@iohk.io>
Co-authored-by: Marcin Szamotulski <coot@coot.me>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

Timed out.

@jbgi
Copy link
Contributor Author

jbgi commented Jan 24, 2023

bors retry

iohk-bors bot added a commit that referenced this pull request Jan 24, 2023
@iohk-bors @jbgi
@newhoggy @coot
Merge #4778
b9eed77 
4778: Nix fixes - 1.35 r=disassembler a=jbgi

this is a backport of #4748.

Co-authored-by: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Co-authored-by: John Ky <john.ky@iohk.io>
Co-authored-by: Marcin Szamotulski <coot@coot.me>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

This PR was included in a batch that successfully built, but then failed to merge into release/1.35. It will not be retried.

Additional information:

{"message":"Required status check \"ci/pr/required\" is pending.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@jbgi
Copy link
Contributor Author

jbgi commented Jan 24, 2023

bors retry

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 24, 2023

Build succeeded:

@iohk-bors iohk-bors bot merged commit e41bdd4 into release/1.35 Jan 24, 2023
@iohk-bors iohk-bors bot deleted the nix-caching-improvements-1.35 branch January 24, 2023 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JaredCorduan JaredCorduan JaredCorduan approved these changes

@disassembler disassembler disassembler approved these changes

@deepfire deepfire Awaiting requested review from deepfire

@jutaro jutaro Awaiting requested review from jutaro

@MarcFontaine MarcFontaine Awaiting requested review from MarcFontaine

@mgmeier mgmeier Awaiting requested review from mgmeier

@cleverca22 cleverca22 Awaiting requested review from cleverca22

@dcoutts dcoutts Awaiting requested review from dcoutts dcoutts is a code owner

@Jimbo4350 Jimbo4350 Awaiting requested review from Jimbo4350 Jimbo4350 is a code owner

@erikd erikd Awaiting requested review from erikd erikd is a code owner

@newhoggy newhoggy Awaiting requested review from newhoggy newhoggy is a code owner

@coot coot Awaiting requested review from coot

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jbgi @disassembler @JaredCorduan @newhoggy @coot