From 8411d10d8da1279794b22e7241884cf0731c0c9d Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Fri, 19 Aug 2022 14:09:31 +0200
Subject: [PATCH] ci: Merge pipelines

---
 .drone.yml | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7668d8c..ef51366 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,6 +11,14 @@ services:
       - name: dockersock
         path: /var/run
 
+volumes:
+  - name: crystal_cache
+    temp: {}
+  - name: docker_cache
+    temp: {}
+  - name: dockersock
+    temp: {}
+
 steps:
   - name: "build:prepare"
     image: busybox
@@ -48,42 +56,16 @@ steps:
       - make docker-save > _artifacts/docker-image.tar
       - make docker-save > _cache/docker-image.tar
 
-volumes:
-  - name: crystal_cache
-    temp: {}
-  - name: docker_cache
-    temp: {}
-  - name: dockersock
-    temp: {}
-#
----
-kind: pipeline
-type: docker
-name: "stage:publish"
-
-depends_on:
-  - "stage:build"
-
-services:
-  - name: docker
-    image: docker:dind
-    privileged: true
-    volumes:
-      - name: dockersock
-        path: /var/run
-
-steps:
   - name: "publish:docker-image"
     image: docker:20.10.16-dind
     volumes:
       - name: dockersock
         path: /var/run
     commands:
+      # Prepare
       - test -f _artifacts/docker-image.tar
       - apk install make
       - make docker-load < _artifacts/docker-image.tar
+      # Build
       - make docker-push
 
-volumes:
-  - name: dockersock
-    temp: {}