diff options
| author | Jonas Bernoulli <jonas@sequoia-pgp.org> | 2021-04-16 15:52:20 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@sequoia-pgp.org> | 2021-04-22 16:25:36 +0200 |
| commit | 58025f5a0390c137fe972d2940c4bea1941ab055 (patch) | |
| tree | 432f8521d351fdc80a3db3ac2073f6e9c8ebcbc4 /.gitlab-ci.yml | |
| parent | 633f4475531a2fe5b1dd42c1ab6560470e4a0943 (diff) | |
make: Hide Makefile to avoid confusion.
- Those make targets that are useful to users are just wrappers
around the respective cargo commands, which means that they are
not really necessary. The additional targets are primarily of
use to Sequoia developers, which also means that they are not
very useful to users.
- That did not keep us from prominently advertising the use of
make as a recommended installation mechanism, and that in turn
contributed to some false expectations and confusion.
- For example, a packager used the Makefile because they thought
that that is what we would like them to do. Some users found it
surprising that "sudo make install" ended up running the target
"build-release" even though they had already build using "build".
- People who want to keep using make without every time having to
specify the name of the hidden Makefile can do so by creating a
symbolic link.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7659c70..d8dbc31d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ build-bullseye: dependencies: - codespell script: - - make + - $MAKE_TOP - if ! git diff --quiet Cargo.lock ; then echo "Cargo.lock changed. Please add the change to the corresponding commit." ; false ; fi - if ! git diff --quiet sq ; then echo "Please commit the changes to sq/src/sq-usage.rs." ; false ; fi - if ! git diff --quiet sqv ; then echo "Please commit the changes to sqv/src/sqv-usage.rs." ; false ; fi @@ -42,7 +42,7 @@ build-bullseye:arm64: dependencies: - codespell script: - - make + - $MAKE_TOP - if ! git diff --quiet Cargo.lock ; then echo "Cargo.lock changed. Please add the change to the corresponding commit." ; false ; fi - if ! git diff --quiet sq ; then echo "Please commit the changes to sq/src/sq-usage.rs." ; false ; fi - if ! git diff --quiet sqv ; then echo "Please commit the changes to sqv/src/sqv-usage.rs." ; false ; fi @@ -61,7 +61,7 @@ bullseye: dependencies: - codespell script: - - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind make test + - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind $MAKE_TOP test variables: CARGO_TARGET_DIR: /target CARGO_HOME: /cargo @@ -85,7 +85,7 @@ bullseye:arm64: - codespell script: # valgrind reports a false positive, see !1035. Run the tests without it for now. - - make test + - $MAKE_TOP test variables: CARGO_TARGET_DIR: /target CARGO_HOME: /cargo @@ -169,7 +169,7 @@ codespell: before_script: - codespell --version script: - - make codespell CODESPELL_FLAGS=--summary + - $MAKE_TOP codespell CODESPELL_FLAGS=--summary after_script: [] rust-stable: @@ -185,7 +185,7 @@ rust-stable: - cargo --version - clang --version script: - - CARGO_PACKAGES="-p buffered-reader -p sequoia-openpgp -p sequoia-sqv" make test + - CARGO_PACKAGES="-p buffered-reader -p sequoia-openpgp -p sequoia-sqv" $MAKE_TOP test variables: CARGO_TARGET_DIR: /target CARGO_HOME: /cargo @@ -204,7 +204,7 @@ rust-stable:arm64: - cargo --version - clang --version script: - - CARGO_PACKAGES="-p buffered-reader -p sequoia-openpgp -p sequoia-sqv" make test + - CARGO_PACKAGES="-p buffered-reader -p sequoia-openpgp -p sequoia-sqv" $MAKE_TOP test variables: CARGO_TARGET_DIR: /target CARGO_HOME: /cargo @@ -271,4 +271,5 @@ variables: RUST_BACKTRACE: full RUSTFLAGS: -D warnings CFLAGS: -Werror + MAKE_TOP: make --file=.Makefile QUICKCHECK_GENERATOR_SIZE: 500 # https://github.com/BurntSushi/quickcheck/pull/240 |