From cd0f271fa3f8e7268393c10538037b4b41a3814b Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 11 Jun 2020 08:08:27 +0200
Subject: [PATCH] Only build docker/electron packages on stable (#2930)

* Only build docker/electron packages on stable

* Docker script cleanup
---
 .github/workflows/push-master.yml |  4 ++--
 scripts/docker.sh                 | 29 ++++++++++-------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index de231807f6..ccc692f146 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -34,7 +34,7 @@ jobs:
   # only run on "CI skip", i.e. when the actual version has been bumped to release/stable
   docker:
     name: docker
-    if: "startsWith(github.event.head_commit.message, '[CI Skip] release/') && github.repository == 'polkadot-js/apps'"
+    if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable') && github.repository == 'polkadot-js/apps'"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -50,7 +50,7 @@ jobs:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    if: "startsWith(github.event.head_commit.message, '[CI Skip] release/') && github.repository == 'polkadot-js/apps'"
+    if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable') && github.repository == 'polkadot-js/apps'"
     name: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v1
diff --git a/scripts/docker.sh b/scripts/docker.sh
index 6e4f465f6f..625fa9e671 100755
--- a/scripts/docker.sh
+++ b/scripts/docker.sh
@@ -18,25 +18,16 @@ VERSION=$(cat package.json \
   | sed 's/[",]//g' \
   | sed 's/ //g')
 
-# helper function for the build logic
-function build () {
-  echo "*** Building $NAME"
-  docker build -t $NAME .
-}
+echo "*** Building $NAME"
+docker build -t $NAME .
 
-# helper function for the publishing logic
-function publish () {
-  docker login -u $REPO -p $DOCKER_PASS
+docker login -u $REPO -p $DOCKER_PASS
 
-  echo "*** Tagging $REPO/$NAME"
-  if [[ $VERSION != *"beta"* ]]; then
-    docker tag $NAME $REPO/$NAME:$VERSION
-  fi
-  docker tag $NAME $REPO/$NAME
+echo "*** Tagging $REPO/$NAME"
+if [[ $VERSION != *"beta"* ]]; then
+  docker tag $NAME $REPO/$NAME:$VERSION
+fi
+docker tag $NAME $REPO/$NAME
 
-  echo "*** Publishing $NAME"
-  docker push $REPO/$NAME
-}
-
-build
-publish
+echo "*** Publishing $NAME"
+docker push $REPO/$NAME