diff options
| author | Azul <azul@riseup.net> | 2021-01-26 10:09:14 +0100 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2021-01-27 09:17:03 +0100 |
| commit | 320ce805978d45631c2f2180f453dc1b97198f08 (patch) | |
| tree | 2796e0fd308a4ce3c6feaf15ba413ad55e50d802 /.gitlab-ci.yml | |
| parent | 3d8bad0e9d9a6c640159ff666b1d99cc0e9c0c36 (diff) | |
ci: Leave out last commit in all_commits.
- If there is only one commit do not rebase at all.
An empty rebase with --exec will still run the exec command once.
- Fixes #628.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0be763c2..23add0fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,9 @@ before_script: - clang --version after_script: - - find $CARGO_TARGET_DIR -type f -atime +7 -delete - - du -sh $CARGO_TARGET_DIR - - du -sh $CARGO_HOME + - if [ -d $CARGO_TARGET_DIR ]; then find $CARGO_TARGET_DIR -type f -atime +7 -delete; fi + - if [ -d $CARGO_TARGET_DIR ]; then du -sh $CARGO_TARGET_DIR; fi + - if [ -d $CARGO_HOME ]; then du -sh $CARGO_HOME; fi bullseye: tags: @@ -55,10 +55,7 @@ all_commits: - clang --version script: - # Use dummy identity to make git rebase happy. - - git config user.name "C.I. McTestface" - - git config user.email "ci.mctestface@example.com" - - if ! git rebase --exec "echo ===; echo ===; echo ===; git log -n 1; cargo test -p sequoia-openpgp" origin/main; then git rebase --abort; false; fi + - .ci/all_commits.sh variables: CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.all_commits |