From 3bf6acef2348162448b1b988a2ba06f0f2e10103 Mon Sep 17 00:00:00 2001
From: Giovanni Petrantoni <7008900+sinkingsugar@users.noreply.github.com>
Date: Tue, 16 Mar 2021 09:31:06 +0900
Subject: [PATCH] merge nbc auto bump with CI in order to bump only on CI
 success

---
 .github/workflows/ci.yml  | 80 ++++++++++++++++++++++++++++++++++++++
 .github/workflows/nbc.yml | 82 ---------------------------------------
 2 files changed, 80 insertions(+), 82 deletions(-)
 delete mode 100644 .github/workflows/nbc.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca6c5df5f..10a442304 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -205,3 +205,83 @@ jobs:
           cd nim-libp2p
           nimble install -y --depsOnly
           nimble test
+
+  bumpNBC-stable:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: status-im/github-app-token@v1
+        name: Generate token
+        id: generate-token
+        with:
+          app_id: ${{ secrets.BUMP_BOT_APP_ID }}
+          private_key: ${{ secrets.BUMP_BOT_APP_PRIVATE_KEY }}
+
+      - name: Clone NBC
+        uses: actions/checkout@v2
+        with:
+          repository: status-im/nimbus-eth2
+          path: nbc
+          submodules: true
+          fetch-depth: 0
+
+      - name: Checkout this ref
+        run: |
+          cd nbc/vendor/nim-libp2p
+          git checkout $GITHUB_SHA
+
+      - name: Commit this bump
+        run: |
+          cd nbc
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+          git config --global user.name = "${{ github.actor }}"
+          git commit -a -m "auto-bump nim-libp2p"
+
+      - name: Make PR
+        uses: peter-evans/create-pull-request@v3.5.0
+        with:
+          branch: nim-libp2p-auto-bump
+          path: nbc
+          token: ${{ steps.generate-token.outputs.token }}
+          title: nim-libp2p auto bump
+
+  bumpNBC-unstable:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: status-im/github-app-token@v1
+        name: Generate token
+        id: generate-token
+        with:
+          app_id: ${{ secrets.BUMP_BOT_APP_ID }}
+          private_key: ${{ secrets.BUMP_BOT_APP_PRIVATE_KEY }}
+
+      - name: Clone NBC
+        uses: actions/checkout@v2
+        with:
+          repository: status-im/nimbus-eth2
+          ref: unstable
+          path: nbc
+          submodules: true
+          fetch-depth: 0
+
+      - name: Checkout this ref
+        run: |
+          cd nbc/vendor/nim-libp2p
+          git checkout $GITHUB_SHA
+
+      - name: Commit this bump
+        run: |
+          cd nbc
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+          git config --global user.name = "${{ github.actor }}"
+          git commit -a -m "auto-bump nim-libp2p"
+
+      - name: Make PR
+        uses: peter-evans/create-pull-request@v3.5.0
+        with:
+          branch: nim-libp2p-auto-bump-unstable
+          path: nbc
+          token: ${{ steps.generate-token.outputs.token }}
+          title: nim-libp2p unstable auto bump
+          draft: true
diff --git a/.github/workflows/nbc.yml b/.github/workflows/nbc.yml
deleted file mode 100644
index 269d82292..000000000
--- a/.github/workflows/nbc.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: NBC Bump PR
-on: [push]
-
-# maybe refactor using matrix but requires changes NBC side
-
-jobs:
-  bumpNBC-stable:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: status-im/github-app-token@v1
-        name: Generate token
-        id: generate-token
-        with:
-          app_id: ${{ secrets.BUMP_BOT_APP_ID }}
-          private_key: ${{ secrets.BUMP_BOT_APP_PRIVATE_KEY }}
-
-      - name: Clone NBC
-        uses: actions/checkout@v2
-        with:
-          repository: status-im/nimbus-eth2
-          path: nbc
-          submodules: true
-          fetch-depth: 0
-
-      - name: Checkout this ref
-        run: |
-          cd nbc/vendor/nim-libp2p
-          git checkout $GITHUB_SHA
-
-      - name: Commit this bump
-        run: |
-          cd nbc
-          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
-          git config --global user.name = "${{ github.actor }}"
-          git commit -a -m "auto-bump nim-libp2p"
-
-      - name: Make PR
-        uses: peter-evans/create-pull-request@v3.5.0
-        with:
-          branch: nim-libp2p-auto-bump
-          path: nbc
-          token: ${{ steps.generate-token.outputs.token }}
-          title: nim-libp2p auto bump
-
-  bumpNBC-unstable:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: status-im/github-app-token@v1
-        name: Generate token
-        id: generate-token
-        with:
-          app_id: ${{ secrets.BUMP_BOT_APP_ID }}
-          private_key: ${{ secrets.BUMP_BOT_APP_PRIVATE_KEY }}
-
-      - name: Clone NBC
-        uses: actions/checkout@v2
-        with:
-          repository: status-im/nimbus-eth2
-          ref: unstable
-          path: nbc
-          submodules: true
-          fetch-depth: 0
-
-      - name: Checkout this ref
-        run: |
-          cd nbc/vendor/nim-libp2p
-          git checkout $GITHUB_SHA
-
-      - name: Commit this bump
-        run: |
-          cd nbc
-          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
-          git config --global user.name = "${{ github.actor }}"
-          git commit -a -m "auto-bump nim-libp2p"
-
-      - name: Make PR
-        uses: peter-evans/create-pull-request@v3.5.0
-        with:
-          branch: nim-libp2p-auto-bump-unstable
-          path: nbc
-          token: ${{ steps.generate-token.outputs.token }}
-          title: nim-libp2p auto bump