diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2020-12-22 12:35:40 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2020-12-22 12:35:40 +0100 |
| commit | c09b52ae081c7a4189fc4aa96da0ada8817378fa (patch) | |
| tree | 733221d6d1f5bb6f3ab662f558020623a233c18a | |
| parent | ee516f806ac4211a626e14c283d4fa032003b3e9 (diff) | |
Fix the all_commits CI job.
- We renamed master to main.
- Change all_commits to check all commits since main, not master.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9156c0b9..ea7db163 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ bullseye: RUSTFLAGS: -D warnings -A unused-parens all_commits: - # Test each commit up to master, to facilitate bisecting. + # Test each commit up to main, to facilitate bisecting. stage: test image: rust:1-slim-buster needs: ["rust-stable"] @@ -60,7 +60,7 @@ all_commits: # 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/master; then git rebase --abort; false; fi + - if ! git rebase --exec "echo ===; echo ===; echo ===; git log -n 1; cargo test -p sequoia-openpgp" origin/main; then git rebase --abort; false; fi variables: CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.all_commits |