Skip to content

Fix format errors#10639

Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom
obsidiansystems:fix-format
May 3, 2024
Merged

Fix format errors#10639
Ericson2314 merged 1 commit intoNixOS:masterfrom
obsidiansystems:fix-format

Conversation

@Ericson2314
Copy link
Member

Motivation

Fix formatting violations, update blacklist to reflect moved files.

Context

PR #10556 passed CI before the new formating rules were added, and our CI has the race condition of allowing old results, resulting in master getting broken.

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

Fix formatting violations, update blacklist to reflect moved files.

PR NixOS#10556 passed CI before the new formating rules were added, and our
CI has the race condition of allowing old results, resulting in master
getting broken.
@Ericson2314 Ericson2314 enabled auto-merge May 3, 2024 01:44
@github-actions github-actions bot added the store Issues and pull requests concerning the Nix store label May 3, 2024
@Ericson2314 Ericson2314 merged commit 00ca2b0 into NixOS:master May 3, 2024
@Ericson2314 Ericson2314 deleted the fix-format branch May 3, 2024 02:42
@cole-h
Copy link
Member

cole-h commented May 3, 2024

our CI has the race condition of allowing old results, resulting in master getting broken.

It's possible to configure branch protections such that it requires the PR to be always up to date with the target branch, if this becomes more of a problem.

@edolstra
Copy link
Member

edolstra commented May 3, 2024

Maybe there is a clang formatter option to not indent #ifdefs? We've never done that historically so it would reduce the diff if we start applying the formatter to existing source files.

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

Labels

store Issues and pull requests concerning the Nix store

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants