Skip to content

gitlab-runner: 17.2.0 -> 17.6.0#356040

Closed
bkp5190 wants to merge 2 commits intoNixOS:masterfrom
bkp5190:gitlab-runner
Closed

gitlab-runner: 17.2.0 -> 17.6.0#356040
bkp5190 wants to merge 2 commits intoNixOS:masterfrom
bkp5190:gitlab-runner

Conversation

@bkp5190
Copy link

@bkp5190 bkp5190 commented Nov 15, 2024

Changelog:

https://gitlab.com/gitlab-org/gitlab-runner/blob/v17.5.3/CHANGELOG.md

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@bkp5190
Copy link
Author

bkp5190 commented Nov 15, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 356040


aarch64-darwin

❌ 1 package failed to build:
  • gitlab-runner

@bkp5190
Copy link
Author

bkp5190 commented Nov 15, 2024

Mentioning #349268. A newer version has been released, some of the dependencies in 17.2.0 contain known vulnerabilities.

cc @zimbatm @globin @krav @talyz @yayayayaka

@bkp5190
Copy link
Author

bkp5190 commented Nov 15, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 356040

aarch64-darwin

❌ 1 package failed to build:

Not sure why nixpkgs-review is failing to build when nix-build directly on the package.nix worked as expected. Investigating now

@ofborg ofborg bot requested review from globin, krav, talyz, yayayayaka and zimbatm November 15, 2024 12:17
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 15, 2024
Copy link
Member

@leona-ya leona-ya left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution!

In #359329 we update to 17.6.1, then we can also continue here. Can you please update this PR to 17.6.0 and then we should be able to merge this then :)

@leona-ya leona-ya mentioned this pull request Nov 27, 2024
13 tasks
@bkp5190
Copy link
Author

bkp5190 commented Nov 27, 2024

Thank you for your contribution!

In #359329 we update to 17.6.1, then we can also continue here. Can you please update this PR to 17.6.0 and then we should be able to merge this then :)

17.6.0 or 17.6.1?

@leona-ya
Copy link
Member

AFAIK there is no gitlab-runner 17.6.1 release, so 17.6.0 should be fine.

@bkp5190
Copy link
Author

bkp5190 commented Nov 27, 2024

Updated to version 17.6.0

@bkp5190 bkp5190 changed the title gitlab-runner: 17.2.0 -> 17.5.3 gitlab-runner: 17.2.0 -> 17.6.0 Nov 27, 2024
@bkp5190
Copy link
Author

bkp5190 commented Nov 27, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 356040


x86_64-linux

✅ 1 package built:
  • gitlab-runner

@bkp5190
Copy link
Author

bkp5190 commented Nov 28, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 356040


aarch64-darwin

❌ 1 package failed to build:
  • gitlab-runner

@gabyx
Copy link
Contributor

gabyx commented Dec 8, 2024

@bkp5190 : Some strange test fails:

       >              Error Trace:    /build/source/helpers/homedir/homedir_test.go:44
       >                                                       /build/source/helpers/homedir/homedir_test.go:82
       >               Error:          Target error should be in err chain:
       >                                   expected: "homedir variable is not set"
       >                                in chain:
       >              Test:           TestFix/HOME_variable_is_not_set_and_homedir_value_is_empty
       > FAIL
       > FAIL gitlab.com/gitlab-org/gitlab-runner/helpers/homedir     0.005s
       > FAIL
       For full logs, run 'nix-store -l /nix/store/yg45yixbwa94mql6n0jxvvyrgzk9n13d-gitlab-runner-17.6.0.drv'.

on linux x86... do these passthru test work on your machine?

@bkp5190
Copy link
Author

bkp5190 commented Dec 8, 2024

@bkp5190 : Some strange test fails:


       >              Error Trace:    /build/source/helpers/homedir/homedir_test.go:44

       >                                                       /build/source/helpers/homedir/homedir_test.go:82

       >               Error:          Target error should be in err chain:

       >                                   expected: "homedir variable is not set"

       >                                in chain:

       >              Test:           TestFix/HOME_variable_is_not_set_and_homedir_value_is_empty

       > FAIL

       > FAIL gitlab.com/gitlab-org/gitlab-runner/helpers/homedir     0.005s

       > FAIL

       For full logs, run 'nix-store -l /nix/store/yg45yixbwa94mql6n0jxvvyrgzk9n13d-gitlab-runner-17.6.0.drv'.

on linux x86... do these passthru test work on your machine?

Yes they do, the other run is attached from linux x86

@digitalrane
Copy link
Contributor

@bkp5190 17.9.1 is out now with a few security fixes, so it would be good to get this PR updated to 17.9.1. If you don't have time, I'm happy to provide a diff?

@leona-ya gitlab-runner is significantly out of date (we're on 17.2 from 2024-10-22, 4+ months) - it would be great if you could re-review this, so that this package can be updated, especially given recent runner security updates in 17.9.0/17.9.1.

@leona-ya
Copy link
Member

Last time I checked this was very broken on darwin :c I tried to fix it, but it needed like 5+ fixes. Maybe now it's right to first merge this and then fix on darwin..

@leona-ya
Copy link
Member

leona-ya commented Mar 15, 2025

I propose a switch to make as upstream does: leona-ya@9bb4e9b

@bkp5190
Copy link
Author

bkp5190 commented Mar 15, 2025

@bkp5190 17.9.1 is out now with a few security fixes, so it would be good to get this PR updated to 17.9.1. If you don't have time, I'm happy to provide a diff?

@leona-ya gitlab-runner is significantly out of date (we're on 17.2 from 2024-10-22, 4+ months) - it would be great if you could re-review this, so that this package can be updated, especially given recent runner security updates in 17.9.0/17.9.1.

Yea a diff would be greatly appreciated! I have not looked at these changes in a while, thanks.

@digitalrane
Copy link
Contributor

I propose a switch to make as upstream does: leona-ya@9bb4e9b

@leona-ya Thank you! I think this change makes a lot of sense! do you think it would be best to open a new PR with those changes (I can take care of this)?

perhaps if @bkp5190 has the spare time we could push that change to this branch and then update the title?

either way, I definitely think using make and mirroring more closely the upstream build approach would be good for reducing nixpkgs maintainer burden

@leona-ya leona-ya mentioned this pull request Mar 22, 2025
13 tasks
@leona-ya
Copy link
Member

I opened a PR with my changes + a few patches to fix build on aarch64-linux and darwin

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@commiterate
Copy link
Contributor

Fixed Darwin builds in #395906.

Bumping to 17.10.1 in #396939.

@commiterate commiterate closed this Apr 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants