From 46b58e97aa64514793809752083e85a7d01c3c01 Mon Sep 17 00:00:00 2001
From: iko <ilyakooo0@gmail.com>
Date: Fri, 5 Feb 2021 13:10:26 +0300
Subject: [PATCH] Updated release checklist to include testing (#29)

---
 .github/workflows/build.yaml |  6 ++++--
 Release_checklist.md         | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 95d0304..175d36e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,10 +4,12 @@ on:
     branches:
       - master
       - develop
+      - staging
   pull_request:
     branches:
       - master
       - develop
+      - staging
 
 jobs:
   octo-macOS:
@@ -73,14 +75,14 @@ jobs:
 
       - name: Login to DockerHub
         id: login-docker-hub
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/staging'
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Push Docker Images to DockerHub
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/staging'
         run: |
           # push docker images to DockerHub
           image_name=`cat octo-docker | docker load | awk '{print $3}'`
diff --git a/Release_checklist.md b/Release_checklist.md
index 46c9318..9d3b8dd 100644
--- a/Release_checklist.md
+++ b/Release_checklist.md
@@ -10,9 +10,12 @@
       2. Tag it with the new `<integer>` (`docker tag`)
       3. Push the new tag (`docker push`)
    3. Update docs where the tags are referenced.
-3. Merge the `develop` branch into `master`.
-4. CI will automatically create a new release in GitHub with _octo CLI_ and update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete.
-5. Edit the created release in GitHub to match the version you are releasing.
+3. Merge the `develop` branch into the `staging` branch.
+4. CI will automatically update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete.
+5. Deploy everything in our private cluser and make sure everything works.
+6. Merge the `staging` branch into `master` using **Rebase and Merge**.
+7. CI will automatically create a new release in GitHub with _octo CLI_ and update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete.
+8. Edit the created release in GitHub to match the version you are releasing.
    1. Change the release name to the version being released.
    2. Uncheck "This is a pre-release"
-6. Push the new release of `octo` and `octopod`. To do this run `./release.sh <version>`.
+9. Push the new release of `octo` and `octopod`. To do this run `./release.sh <version>`.