From f89c1a559d2cd53bf5b3b4218e6b657517eabe58 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 11 May 2021 14:53:53 -0400 Subject: UseJava: Avoid non-word "compilability" in documentation Also fix spelling in the release note from commit 3e03f359a7 (UseJava: Add RESOURCES with NAMESPACE to add_jar(), 2021-04-27). --- Help/release/dev/UseJava-RESOURCES-NAMESPACE.rst | 2 +- Modules/UseJava.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Help/release/dev/UseJava-RESOURCES-NAMESPACE.rst b/Help/release/dev/UseJava-RESOURCES-NAMESPACE.rst index a7bb685..caa07e7 100644 --- a/Help/release/dev/UseJava-RESOURCES-NAMESPACE.rst +++ b/Help/release/dev/UseJava-RESOURCES-NAMESPACE.rst @@ -2,4 +2,4 @@ UseJava-RESOURCES-NAMESPACE --------------------------- * The :module:`UseJava` module command ``add_jar`` gained option RESOURCES - allow explicit naming of resouces with non-optional namespace. + allow explicit naming of resources with non-optional namespace. diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 67478cc..baed7ef 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -51,7 +51,7 @@ almost certainly result in confusion. .. note:: SOURCES Adding resources via the ``SOURCES`` parameter relies upon a hard-coded - list of file extensions which are tested to determine compilability + list of file extensions which are tested to determine whether they compile (e.g. File.java). ``SOURCES`` files which match the extensions are compiled. Files which do not match are treated as resources. To include uncompiled resources matching those file extensions use the ``RESOURCES`` parameter. -- cgit v0.12 From bf35f3848a95c1dbebe09f2f1fca6ba4635b5aec Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 10 May 2021 11:07:36 -0400 Subject: gitlab-ci: rename lint builds to start in lint: --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fc907d..1d4e7f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,21 +99,21 @@ upload:help:stage: # Lint builds -build:debian10-iwyu: +lint:debian10-iwyu: extends: - .debian10_iwyu - .cmake_build_linux - .linux_builder_tags - .run_automatically -build:fedora34-tidy: +lint:fedora34-tidy: extends: - .fedora34_tidy - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically -build:fedora34-sphinx: +lint:fedora34-sphinx: extends: - .fedora34_sphinx - .cmake_build_linux -- cgit v0.12 From bca69d4272b975e7cad7b8dd780cf45dc30f6b68 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 10 May 2021 11:08:11 -0400 Subject: gitlab-ci: add codespell lint job --- .codespellrc | 2 +- .gitlab-ci.yml | 6 ++++++ .gitlab/os-linux.yml | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.codespellrc b/.codespellrc index c450ea2..ba0fba6 100644 --- a/.codespellrc +++ b/.codespellrc @@ -5,5 +5,5 @@ count = # Disable warnings about binary files quiet-level = 2 builtin = clear,rare,en-GB_to_en-US -skip = */.git,*/Copyright.txt,*/doxygen.config,*/Modules/Internal/CPack/NSIS.template.in,*/Source/CursesDialog/form/*,*/Source/kwsys/*,*/Tests/RunCMake/CPack/tests/DMG_SLA/German.*,*/Utilities/cm* +skip = */.git,*/build,*/Copyright.txt,*/doxygen.config,*/Modules/Internal/CPack/NSIS.template.in,*/Source/CursesDialog/form/*,*/Source/kwsys/*,*/Tests/RunCMake/CPack/tests/DMG_SLA/German.*,*/Utilities/cm* ignore-words-list = aci,ake,ans,ba,cconfiguration,conly,dependees,dne,dum,earch,ect,filetest,fo,helpfull,hiden,isnt,keypair,nd,ned,nin,nknown,ot,pard,seh,ser,te,upto,varn,vas,wee diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d4e7f5..aac1d9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,12 @@ upload:help:stage: # Lint builds +lint:codespell: + extends: + - .cmake_codespell_linux + - .linux_builder_tags + - .run_automatically + lint:debian10-iwyu: extends: - .debian10_iwyu diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f608474..1bf4098 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -258,6 +258,13 @@ interruptible: true +.cmake_codespell_linux: + stage: build + extends: .fedora34 + script: + - codespell + interruptible: true + .cmake_build_linux: stage: build -- cgit v0.12