summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2020-09-21 10:06:59 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2020-09-21 16:32:16 +0200
commitcbbcf35b6978be78e95b1701e33f96e02bb300c1 (patch)
tree7dcb201d9eddc8750db1d80c8d90128a443813cb
parent6b49eceac23a0223cd0bcb11c1803f370bf8dcf2 (diff)
ci: Extract codespell job.
- Ingore all target dirs. - Adapt to new codespell dictionary: Add keyserver, keypair, dedup, fpr to ingore list.
-rw-r--r--.gitlab-ci.yml19
-rw-r--r--Makefile4
2 files changed, 21 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbaff26b..5f608481 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+stages:
+ - pre-check
+ - build
+
before_script:
- if [ -d $CARGO_TARGET_DIR ]; then find $CARGO_TARGET_DIR | wc --lines; du -sh $CARGO_TARGET_DIR; fi
- if [ -d $CARGO_HOME ]; then find $CARGO_HOME | wc --lines; du -sh $CARGO_HOME; fi
@@ -15,6 +19,8 @@ bullseye:
- linux
stage: build
image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye:latest
+ dependencies:
+ - codespell
script:
- SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind cargo test -p sequoia-openpgp-ffi
@@ -31,11 +37,24 @@ bullseye:
CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.bullseye
RUSTFLAGS: -D warnings -A unused-parens
+codespell:
+ tags:
+ - linux
+ stage: pre-check
+ image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye:latest
+
+ before_script:
+ - codespell --version
+ script:
+ - make codespell CODESPELL_FLAGS=--summary
+ after_script: []
+
rust-stable:
tags:
- linux
stage: build
image: rust:1-slim-buster
+ needs: []
before_script:
- apt update -y -qq
diff --git a/Makefile b/Makefile
index 8ec19ee4..3ba23441 100644
--- a/Makefile
+++ b/Makefile
@@ -172,5 +172,5 @@ sanity-check-versions:
.PHONY: codespell
codespell:
$(CODESPELL) $(CODESPELL_FLAGS) \
- -L "ede,iff,mut,nd,te,uint" \
- -S "*.bin,*.gpg,*.pgp,./.git,./target,data,highlight.js"
+ -L "ede,iff,mut,nd,te,uint,KeyServer,keyserver,Keyserver,keyservers,Keyservers,keypair,keypairs,KeyPair,fpr,dedup" \
+ -S "*.bin,*.gpg,*.pgp,./.git,data,highlight.js,*/target,Makefile"