Skip to content

gitlab: 17.5.2 -> 17.6.1#359329

Merged
leona-ya merged 1 commit intoNixOS:masterfrom
xanderio:gitlab-17.6.1
Dec 8, 2024
Merged

gitlab: 17.5.2 -> 17.6.1#359329
leona-ya merged 1 commit intoNixOS:masterfrom
xanderio:gitlab-17.6.1

Conversation

@xanderio
Copy link
Contributor

@xanderio xanderio commented Nov 26, 2024

Requires: #360160

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.

@xanderio xanderio added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-24.05 labels Nov 26, 2024
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 26, 2024
@xanderio xanderio marked this pull request as ready for review November 26, 2024 22:29
@leona-ya leona-ya mentioned this pull request Nov 27, 2024
13 tasks
@leona-ya
Copy link
Member

I think we should update gitlab-runner also soon, but it currently still compatible. See #356040

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.

This works fine on my instance and also the NixOS Tests succeed.

@xanderio xanderio added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 27, 2024
@ofborg ofborg bot requested review from blitz, globin, krav, talyz and yayayayaka November 27, 2024 19:39
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 27, 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.

We first need to update to 17.5.3, as this is a stop release

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 28, 2024
@xanderio xanderio removed the 1.severity: security Issues which raise a security issue, or PRs that fix one label Nov 29, 2024
@xanderio xanderio changed the title gitlab: 17.3.7 -> 17.6.1 gitlab: 17.5.2 -> 17.6.1 Nov 29, 2024
@leona-ya
Copy link
Member

leona-ya commented Dec 8, 2024

Can you rebase this on master, then it should be ready to merge from my side.

@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 8, 2024
@leona-ya leona-ya merged commit 91fb266 into NixOS:master Dec 8, 2024
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 8, 2024

Successfully created backport PR for release-24.05:

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 8, 2024

Successfully created backport PR for release-24.11:

@xanderio xanderio deleted the gitlab-17.6.1 branch December 8, 2024 17:14
@leona-ya leona-ya added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Dec 11, 2024
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 11, 2024

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-359329-to-release-24.05 origin/release-24.05
cd .worktree/backport-359329-to-release-24.05
git switch --create backport-359329-to-release-24.05
git cherry-pick -x b7eae8cb6ad3dcde8c6a9d19e0a81004c94e2a50

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 11, 2024

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-359329-to-release-24.11 origin/release-24.11
cd .worktree/backport-359329-to-release-24.11
git switch --create backport-359329-to-release-24.11
git cherry-pick -x b7eae8cb6ad3dcde8c6a9d19e0a81004c94e2a50

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants