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

hydra: switch to fork #1349

Merged
merged 3 commits into from
Sep 16, 2024
Merged

hydra: switch to fork #1349

merged 3 commits into from
Sep 16, 2024

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Jul 6, 2024

Manually deployed on build03 for testing.

@zowoq zowoq closed this Jul 9, 2024
@zowoq zowoq deleted the hydra branch July 9, 2024 00:49
@zowoq zowoq restored the hydra branch July 26, 2024 08:08
@zowoq zowoq reopened this Jul 26, 2024
@zowoq zowoq force-pushed the hydra branch 2 times, most recently from 18be010 to 27a6100 Compare July 26, 2024 09:38
@zowoq zowoq closed this Jul 27, 2024
@zowoq zowoq deleted the hydra branch July 27, 2024 04:07
@zowoq zowoq restored the hydra branch August 7, 2024 05:44
@zowoq zowoq reopened this Aug 7, 2024
@zowoq zowoq changed the title modules/nixos/hydra: switch to upstream modules/nixos/hydra: switch to fork Aug 7, 2024
@zowoq zowoq force-pushed the hydra branch 3 times, most recently from 0a45323 to d8c0264 Compare August 11, 2024 00:01
@zowoq zowoq changed the title modules/nixos/hydra: switch to fork hydra: switch to fork Aug 11, 2024
@@ -24,6 +24,8 @@
flake-compat.url = "github:nix-community/flake-compat";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts";
hydra.flake = false;
hydra.url = "github:qowoz/hydra/community";
Copy link
Member

@Mic92 Mic92 Aug 11, 2024

Choose a reason for hiding this comment

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

Should we just ask for commit access and get those commits in upstream?
We can probably even test them on the actual NixOS hydra, the current infra team is looking for help anyway.

Copy link
Contributor Author

@zowoq zowoq Aug 11, 2024

Choose a reason for hiding this comment

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

Almost all of them have been deployed on hydra.nixos.org for a while and are in various upstream branches / PRs.

Copy link
Member

@Mic92 Mic92 Aug 11, 2024

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

@zowoq even more a reason to just merge them into the hydra branch. I ask for access.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm also looking at picking the lix patches that replace hydra-eval-jobs with nix-eval-jobs. Would need to pick a couple their patches for nix-eval-jobs as well.

Copy link
Member

@Mic92 Mic92 Aug 22, 2024

Choose a reason for hiding this comment

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

@zowoq if I would look at this, would you be ok, if we run the result on nix-community infra?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm happy to pick patches from a upstream PR if that is what you mean?

Copy link
Member

Choose a reason for hiding this comment

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

I mean, I would need to test patches as well in a non-trivial setup and do fixes as needed. Local testing of demo instances only take you so far.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For that I'd suggest deploying another hydra instance on build01.

Copy link
Member

Choose a reason for hiding this comment

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

I was hoping we could test hydra changes together, but in that case I could also look for a different project where I can deploy a hydra.

@zowoq zowoq force-pushed the hydra branch 3 times, most recently from f389f22 to 328820b Compare August 27, 2024 23:53
@zowoq
Copy link
Contributor Author

zowoq commented Aug 28, 2024

I've deployed the patches for this: GHSA-xv29-v93r-2f5v.

this is the default but we need to set it explictly as it is currently broken upstream and in nixpkgs
@zowoq zowoq marked this pull request as ready for review September 16, 2024 02:53
@zowoq zowoq added this pull request to the merge queue Sep 16, 2024
Merged via the queue into master with commit 2759825 Sep 16, 2024
37 checks passed
@zowoq zowoq deleted the hydra branch September 16, 2024 02:55
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.

4 participants