Skip to content

Commit

Permalink
ci: fix cherry-pick job by using newer git
Browse files Browse the repository at this point in the history
git/git@37897bf made it possible to use
the -m flag with cherry-pick, even when the target is not a merge commit.

This commit changes the image used to run the cherry-pick job to alpine so that we get
a more recent version of git.

The alpine image will also download much faster when the CI node does not have the image cached.
  • Loading branch information
dnephin committed Mar 23, 2020
1 parent 98a2d5a commit 3418835
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,9 @@ jobs:
# only runs on master: checks latest commit to see if the PR associated has a backport/* or docs* label to cherry-pick
cherry-picker:
docker:
- image: *GOLANG_IMAGE
- image: alpine:3.11
steps:
- run: apk add --no-cache --no-progress git bash curl ncurses jq
- checkout
- add_ssh_keys: # needs a key to push cherry-picked commits back to github
fingerprints:
Expand Down

0 comments on commit 3418835

Please sign in to comment.