Skip to content

gitlab-runner: 17.2.0 -> 17.9.1#392089

Closed
leona-ya wants to merge 1 commit intoNixOS:masterfrom
leona-ya:push-xumymyxwyzlw
Closed

gitlab-runner: 17.2.0 -> 17.9.1#392089
leona-ya wants to merge 1 commit intoNixOS:masterfrom
leona-ya:push-xumymyxwyzlw

Conversation

@leona-ya
Copy link
Member

@leona-ya leona-ya commented Mar 22, 2025

  • Switch build invocations to make
  • Fix build errors on darwin

superseedes #356040

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.

@leona-ya leona-ya force-pushed the push-xumymyxwyzlw branch from 9222156 to d0d24e1 Compare March 22, 2025 13:12
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Mar 22, 2025
@leona-ya leona-ya force-pushed the push-xumymyxwyzlw branch from d0d24e1 to 25cc19b Compare March 22, 2025 13:16
@github-actions github-actions bot added the 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. label Mar 22, 2025
@drupol drupol marked this pull request as draft March 25, 2025 06:57
* Switch build invocations to make
* Fix build errors on darwin
@leona-ya leona-ya force-pushed the push-xumymyxwyzlw branch from 25cc19b to 7dcaf4d Compare March 27, 2025 22:22
@leona-ya leona-ya requested a review from drupol March 27, 2025 22:22
@leona-ya leona-ya marked this pull request as ready for review March 27, 2025 22:22

postPatch = ''
substituteInPlace Makefile --replace-fail "export VERSION := \$(shell ./ci/version)" "export VERSION := ${version}"
substituteInPlace Makefile --replace-fail "REVISION := \$(shell git rev-parse --short=8 HEAD || echo unknown)" "REVISION := v${version}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps I am wrong but, I think the .git folder is stripped out, so git rev-parse won't work.
Have you tested this?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's correct. I switched back to draft, as I made a mistake while pushing. 17.9.2 introduced further changes (mroe tests fail when not there is no .git directory). I'm currently trying some more things...

Comment on lines +76 to +77
mkdir $out/bin
cp out/binaries/gitlab-runner-$GOOS-$GOARCH $out/bin/gitlab-runner
Copy link
Contributor

Choose a reason for hiding this comment

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

install -Dm755 out/binaries/gitlab-runner-$GOOS-$GOARCH "$out/bin/gitlab-runner"

@leona-ya leona-ya marked this pull request as draft March 27, 2025 22:30
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@commiterate commiterate mentioned this pull request Apr 7, 2025
13 tasks
@wegank
Copy link
Member

wegank commented Apr 19, 2025

Done in #396939.

@wegank wegank closed this Apr 19, 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.

3 participants