Skip to content

Commit 7324380

Browse files
committed
ci: configure linelint for the schema of the pinned 0.0.6 version
The fernandrone/linelint action is pinned to 0.0.6, whose configuration schema differs from the current project README: the only supported rule is end-of-file, controlled by rules.end-of-file.enable, and exclusions use gitignore-style ignore patterns. The previous configuration file followed the newer schema, so the pinned version parsed it to zero enabled rules and failed with "No valid rule enabled". Rewrite the configuration for the 0.0.6 schema, enable the end-of-file rule with single-new-line, and normalise the eleven first-party files that ended without a final newline or with a trailing blank line. The cmake/version.cmake file is excluded because the version-cmake-up-to-date job diffs it byte-for-byte against rnpgp/cmake-versioning, whose copy does not end with a newline.
1 parent 11266d1 commit 7324380

12 files changed

Lines changed: 14 additions & 22 deletions

File tree

‎.clang-format‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,3 @@ Standard: Auto
6464
TabWidth: 8
6565
UseTab: Never
6666
...
67-

‎.linelint.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1+
# Configured for linelint 0.0.6, the version pinned by
2+
# fernandrone/linelint@0.0.6 in .github/workflows/lint.yml. That version
3+
# implements the end-of-file rule only, with gitignore-style `ignore`
4+
# patterns; the newer schemas on the project README are not compatible.
15
rules:
2-
trailing_whitespace:
3-
enabled: true
4-
end_of_file:
5-
enabled: true
6-
inserted_final_newline:
7-
enabled: true
8-
tabs:
9-
enabled: true
10-
conflicts:
11-
enabled: true
12-
exclude:
6+
end-of-file:
7+
enable: true
8+
single-new-line: true
9+
ignore:
1310
- 'src/tests/data/'
1411
- 'src/lib/nlohmann/'
1512
- 'src/libsexpp/'
1613
- 'cmake/Modules/FindWindowsSDK.cmake'
14+
# Kept byte-identical to rnpgp/cmake-versioning, whose copy does not end
15+
# with a newline; the version-cmake-up-to-date job diffs the two files.
16+
- 'cmake/version.cmake'
1717
- 'ci/utf8-manifest'
1818
- 'docs/'
1919
- 'CHANGELOG.md'

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
theme: jekyll-theme-leap-day
1+
theme: jekyll-theme-leap-day

‎ci-legacy/style-check.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ if [ "$diffs" != "" ]; then
1111
echo "$diffs"
1212
exit 1
1313
fi
14-

‎cmake/Modules/FindGnuPG.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,3 @@ find_package_handle_standard_args(GnuPG
134134
VERSION_VAR GNUPG_VERSION
135135
HANDLE_COMPONENTS
136136
)
137-

‎cmake/librnp.pc.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ Version: @PROJECT_VERSION@
1010
Libs: -L${libdir} -l@LIBRNP_OUTPUT_NAME@
1111
Libs.private: @LIBRNP_PRIVATE_LIBS@
1212
Cflags: -I${includedir}
13-

‎cmake/rnp_tests_discover.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,3 @@ foreach(line ${output})
3737
endforeach()
3838

3939
file(WRITE "${CTEST_FILE}" "${script}")
40-

‎default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ stdenv.mkDerivation rec {
4141
platforms = platforms.all;
4242
maintainers = with maintainers; [ ribose-jeffreylau ];
4343
};
44-
}
44+
}

‎flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
];
2424
};
2525
});
26-
}
26+
}

‎git-hooks/enable.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
#!/bin/sh
22
ln -sf ../../git-hooks/pre-commit.sh "$(git rev-parse --show-toplevel)/.git/hooks/pre-commit"
3-

0 commit comments

Comments
 (0)