From 9fc24f69c49359b4640cd84e71050e299b396fa7 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Thu, 27 Oct 2022 22:39:36 +0200
Subject: [PATCH] [GitHub Actions] Fix tmp file

---
 publish-app.sh                           | 5 +++--
 scripts/k8s/runners-stream-ci-large.yaml | 2 +-
 scripts/remove-jib-plugin.sh             | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/publish-app.sh b/publish-app.sh
index de6f4ef6..cba4bf16 100644
--- a/publish-app.sh
+++ b/publish-app.sh
@@ -47,14 +47,15 @@ pushd "$PROJECT_FOLDER" > /dev/null
       for app in $APPS; do
         set -e
         docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$VERSION"
+        docker push "springcloudstream/$app:$VERSION"
+        echo "Pushed:springcloudstream/$app:$VERSION"
         if [ "$BRANCH" != "" ]; then
           docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH"
           echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH"
+          docker push "springcloudstream/$app:$BRANCH"
         fi
         docker push "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK"
         echo "Pushed:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK"
-        docker push "springcloudstream/$app:$VERSION"
-        echo "Pushed:springcloudstream/$app:$VERSION"
         for v in $JDKS; do
           docker push "springcloudstream/$app:$VERSION-jdk$v"
           echo "Pushed:springcloudstream/$app:$VERSION-jdk$v"
diff --git a/scripts/k8s/runners-stream-ci-large.yaml b/scripts/k8s/runners-stream-ci-large.yaml
index 0d60e78c..ad36c020 100644
--- a/scripts/k8s/runners-stream-ci-large.yaml
+++ b/scripts/k8s/runners-stream-ci-large.yaml
@@ -30,7 +30,7 @@ spec:
   githubAPICredentialsFrom:
     secretRef:
       name: controller-manager-secret
-  minReplicas: 0
+  minReplicas: 1
   maxReplicas: 2
   scaleTargetRef:
     kind: RunnerDeployment
diff --git a/scripts/remove-jib-plugin.sh b/scripts/remove-jib-plugin.sh
index 62e5ef39..7cf1bd5d 100755
--- a/scripts/remove-jib-plugin.sh
+++ b/scripts/remove-jib-plugin.sh
@@ -5,8 +5,7 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 FILE=$(realpath $1)
-TMP_FILE="$1-pom-mod.xml"
-TMP_FILE="${TMP_FILE//\//-/g}"
+TMP_FILE=pom-mod.xml
 echo "Removing jib-maven-plugin from $FILE"
 xsltproc -o $TMP_FILE $SCDIR/remove-jib-plugin.xsl $FILE
 RC=$?
@@ -14,4 +13,4 @@ if((RC!=0)); then
   exit 1
 fi
 mv -f $TMP_FILE $FILE
-#rm -f $TMP_FILE
+rm -rf $TMP_FILE