[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] ci: fixing the nix shell format
From: |
Jose E. Marchesi |
Subject: |
Re: [PATCH] ci: fixing the nix shell format |
Date: |
Wed, 04 Oct 2023 17:47:54 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Thanks. This falls in the category of obvious commits. You can just
push these without needing an OK. But then please send a [COMMITTED]
message to the list.
BTW, speaking of obvious commits, you want to add yourself to
the "Write After Approval" section in etc/hacking.org. You can then
regenerate HACKING from it by running `make update-hacking'.
> 2023-10-04 Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
>
> * etc/nix/default.nix: remove the empty line at the EOF.
>
> ---
> Hi Jose,
>
> I wanted to correct an oversight. I ran the "make check" target and pushed
> it when I received a green pass. However, I edited the nix code using my nvim
> editor, which I don't typically use. By default, nvim added an empty line
> at the end.
>
> If it's acceptable to you, I can avoid pushing another commit and instead
> fix up the original one. Please let me know your preference.
>
> This commit is fixing the CI failure
>
> 0.02 prohibit_double_semicolon
> prohibit_doubled_word
> 0.08 prohibit_doubled_word
> prohibit_empty_lines_at_EOF
> etc/nix/default.nix
> maint.mk: empty line(s) or no newline at EOF
> make: *** [maint.mk:995: sc_prohibit_empty_lines_at_EOF] Error 1
> program finished with exit code 2
> elapsedTime=1.782967
>
> Reported-by: CI
> https://builder.sourceware.org/buildbot/#/builders/218/builds/330
> Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
> ---
> ChangeLog | 4 ++++
> etc/nix/default.nix | 1 -
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 6b83825f..82f8d3ae 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,7 @@
> +2023-10-04 Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
> +
> + * etc/nix/default.nix: remove the empty line at the EOF.
> +
> 2023-10-02 Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
>
> * etc/nix/default.nix: add a simple nix shell.
> diff --git a/etc/nix/default.nix b/etc/nix/default.nix
> index d55b2014..63f71f18 100755
> --- a/etc/nix/default.nix
> +++ b/etc/nix/default.nix
> @@ -39,4 +39,3 @@ stdenv.mkDerivation {
> valgrind
> ];
> }
> -