From 15b4200698520c42c4be5707280961894f7fa4a7 Mon Sep 17 00:00:00 2001
From: jkoan <jkoan@users.noreply.github.com>
Date: Fri, 8 Jan 2021 13:23:47 +0100
Subject: fix:builds:Revert baseimage back and oly set merge_trunk_in_master to
 cimg/base

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.circleci')

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:
-- 
cgit v1.2.1