From e0919b8b6b5e637a96dd1ae64d527052093f31c3 Mon Sep 17 00:00:00 2001
From: Vincent Boutour <bob@vibioh.fr>
Date: Sat, 10 Jul 2021 22:57:54 +0200
Subject: [PATCH] ci: Merging binary upload and docker image tagging in same
 workflows

Signed-off-by: Vincent Boutour <bob@vibioh.fr>
---
 .github/workflows/release.yaml |  7 +++++++
 .github/workflows/tag.yaml     | 29 -----------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/tag.yaml

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 50f1181..7f0f38d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,3 +33,10 @@ jobs:
           curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "release"
           export GIT_TAG="$(basename ${{ github.ref }})"
           scripts/release build assets clean
+      - name: Docker
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
+          DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
+        run: |
+          curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "docker_promote"
+          scripts/docker_promote "${{ secrets.DOCKER_USER }}/$(make name)" "$(make version)" "$(basename ${{ github.ref }})"
diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
deleted file mode 100644
index 851bada..0000000
--- a/.github/workflows/tag.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Tag
-
-on:
-  push:
-    tags:
-      - "*"
-
-env:
-  SCRIPTS_NO_INTERACTIVE: "true"
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  tag:
-    name: Tag
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Tag
-        env:
-          DOCKER_USER: ${{ secrets.DOCKER_USER }}
-          DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
-        run: |
-          curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "docker_promote"
-          scripts/docker_promote "${{ secrets.DOCKER_USER }}/$(make name)" "$(make version)" "$(basename ${{ github.ref }})"