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

gitlab: 16.10.6 -> 16.11.4 #319486

Merged
merged 2 commits into from
Jun 13, 2024
Merged

gitlab: 16.10.6 -> 16.11.4 #319486

merged 2 commits into from
Jun 13, 2024

Conversation

yayayayaka
Copy link
Member

@yayayayaka yayayayaka commented Jun 13, 2024

Description of changes

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@vcunat
Copy link
Member

vcunat commented Jun 13, 2024

I'm confused about this test
@ofborg build nixosTests.gitlab

As what I see is failure since the last staging-next (PR #316075), with lots of "Early termination of worker" and the test timing out (locally and on Hydra). This PR doesn't help that issue, according to my testing, but the CI here looked like success :-/ This test failure blocks nixos-unstable now, BTW.

@vcunat
Copy link
Member

vcunat commented Jun 13, 2024

Both *-linux passed the test in ofBorg. So that is weird.

@yayayayaka
Copy link
Member Author

yayayayaka commented Jun 13, 2024

Even after rebasing to the latest master commit, the NixOS test is still building fine for me locally.

@vcunat
Copy link
Member

vcunat commented Jun 13, 2024

It passed for me now. So I'm not sure if I made a mistake when trying this PR atop nixpkgs master? (and it's actually fixing the test) Or is it flaky?

@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Jun 13, 2024
@vcunat
Copy link
Member

vcunat commented Jun 13, 2024

I think this PR solves the test failure.

@K900 K900 merged commit a3ba07a into NixOS:master Jun 13, 2024
23 of 25 checks passed
@K900
Copy link
Contributor

K900 commented Jun 13, 2024

Let's just merge this, it's a security fix and blocks the channel.

Copy link
Contributor

Backport failed for release-23.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-23.11
git worktree add -d .worktree/backport-319486-to-release-23.11 origin/release-23.11
cd .worktree/backport-319486-to-release-23.11
git switch --create backport-319486-to-release-23.11
git cherry-pick -x 7e9c87c67b97efa5c174fde31426a5df2369ab72 e34d62d869c3fbd23ab7440628bfea28b1e176c2

Copy link
Contributor

Successfully created backport PR for release-24.05:

@yayayayaka yayayayaka deleted the gitlab-16.11.4 branch June 13, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants