From d0bac345c66c01f5374d447cd79f7057165dd061 Mon Sep 17 00:00:00 2001
From: Lev Vereshchagin <mail@vrslev.com>
Date: Fri, 17 Dec 2021 11:43:48 +0300
Subject: [PATCH] Move release_helm job to main.yml

---
 .github/workflows/docker-build.yml |  22 ------
 .github/workflows/main.yml         | 112 +++++++++--------------------
 2 files changed, 34 insertions(+), 100 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index fd904eba..e7822bdb 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -73,25 +73,3 @@ jobs:
         uses: docker/bake-action@v1.6.0
         with:
           push: true
-
-  release_helm:
-    runs-on: ubuntu-latest
-    if: inputs.push
-    needs: build
-
-    steps:
-      - name: Setup deploy key
-        uses: webfactory/ssh-agent@v0.5.4
-        with:
-          ssh-private-key: ${{ secrets.HELM_DEPLOY_KEY }}
-
-      - name: Setup Git Credentials
-        run: |
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-
-      - name: Release
-        run: |
-          git clone git@github.com:frappe/helm.git && cd helm
-          pip install -r release_wizard/requirements.txt
-          ./release_wizard/wizard 13 patch --remote origin --ci
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 02beacda..636ff4a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,84 +35,7 @@ on:
   # workflow_dispatch:
 
 jobs:
-  # build:
-  #   runs-on: ubuntu-latest
-  #   services:
-  #     registry:
-  #       image: registry:2
-  #       ports:
-  #         - 5000:5000
-
-  #   strategy:
-  #     matrix:
-  #       version: [12, 13]
-
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-
-  #     - name: Setup Python
-  #       uses: actions/setup-python@v2
-  #       with:
-  #         python-version: 3.9
-
-  #     - name: Setup Buildx
-  #       uses: docker/setup-buildx-action@v1
-  #       with:
-  #         driver-opts: network=host
-
-  #     - name: Install Docker Compose v2
-  #       uses: ndeloof/install-compose-action@4a33bc31f327b8231c4f343f6fba704fedc0fa23
-
-  #     - name: Get latest versions
-  #       run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version ${{ matrix.version }}
-
-  #     - name: Build
-  #       uses: docker/bake-action@v1.6.0
-  #       with:
-  #         push: true
-  #       env:
-  #         USERNAME: localhost:5000/frappe
-
-  #     - name: Test
-  #       run: python3 tests/main.py
-
-  #     - name: Login
-  #       if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-  #       uses: docker/login-action@v1
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  #     - name: Push
-  #       if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-  #       uses: docker/bake-action@v1.6.0
-  #       with:
-  #         push: true
-
-  # release_helm:
-  #   runs-on: ubuntu-latest
-  #   if: github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request'
-  #   needs: build
-
-  #   steps:
-  #     - name: Setup deploy key
-  #       uses: webfactory/ssh-agent@v0.5.4
-  #       with:
-  #         ssh-private-key: ${{ secrets.HELM_DEPLOY_KEY }}
-
-  #     - name: Setup Git Credentials
-  #       run: |
-  #         git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-  #         git config --global user.name "github-actions[bot]"
-
-  #     - name: Release
-  #       run: |
-  #         git clone git@github.com:frappe/helm.git && cd helm
-  #         pip install -r release_wizard/requirements.txt
-  #         ./release_wizard/wizard 13 patch --remote origin --ci
-
-  build2:
+  v12:
     uses: vrslev/frappe_docker/.github/workflows/docker-build.yml@beautify
     with:
       repo: "erpnext"
@@ -122,3 +45,36 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       HELM_DEPLOY_KEY: ${{ secrets.HELM_DEPLOY_KEY }}
+
+  v13:
+    uses: vrslev/frappe_docker/.github/workflows/docker-build.yml@beautify
+    with:
+      repo: "erpnext"
+      version: "13"
+      push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      HELM_DEPLOY_KEY: ${{ secrets.HELM_DEPLOY_KEY }}
+
+  release_helm:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+    needs: v13
+
+    steps:
+      - name: Setup deploy key
+        uses: webfactory/ssh-agent@v0.5.4
+        with:
+          ssh-private-key: ${{ secrets.HELM_DEPLOY_KEY }}
+
+      - name: Setup Git Credentials
+        run: |
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+
+      - name: Release
+        run: |
+          git clone git@github.com:frappe/helm.git && cd helm
+          pip install -r release_wizard/requirements.txt
+          ./release_wizard/wizard 13 patch --remote origin --ci