diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2021-01-08 13:23:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 13:23:47 +0100 |
| commit | 15b4200698520c42c4be5707280961894f7fa4a7 (patch) | |
| tree | 6988a231b189382e7c9d91e8ec8d88a97a9a8790 /.circleci | |
| parent | b6e37aee720342bc812c05d898048a0373ea71de (diff) | |
| download | navit-15b4200698520c42c4be5707280961894f7fa4a7.tar.gz | |
fix:builds:Revert baseimage back and oly set merge_trunk_in_master to cimg/base
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 79c7af42b..0f0bf5470 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 defaults: &defaults docker: - - image: cimg/base:2020.01 + - image: debian:latest jobs: sanity_check: docker: @@ -219,7 +219,8 @@ jobs: command: | bash scripts/update_download_center.sh merge_trunk_in_master: - <<: *defaults + docker: + - image: cimg/base:2020.01 steps: - checkout - run: |