From 39116bc631577bd0b43b8b048d3b3c61fe6c8712 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 17 Dec 2021 14:58:03 +0100
Subject: [PATCH] testing selfhost job

---
 .github/workflows/deploy-cloud.yaml    | 10 +++++++-
 .github/workflows/release-selfhost.yml |  2 +-
 .github/workflows/release.yml          | 32 +++++++++++++-------------
 package.json                           |  2 +-
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml
index ee86bb07ca..74693e3848 100644
--- a/.github/workflows/deploy-cloud.yaml
+++ b/.github/workflows/deploy-cloud.yaml
@@ -50,4 +50,12 @@ jobs:
           chart-path: charts/budibase
           namespace: budibase
           values: globals.appVersion=v${{ env.RELEASE_VERSION }}
-          name: budibase-prod
\ No newline at end of file
+          name: budibase-prod
+
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@v4.0.0
+        with:
+          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
+          content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to budibase cloud."
+          embed-title: ${{ env.RELEASE_VERSION }}
+
diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index 9a6b75959a..3e2e5ca6b7 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -17,7 +17,6 @@ jobs:
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
 
           # Get latest release version
-          sudo apt-get install -y jq 
           release_version=$(cat lerna.json | jq -r '.version')
           echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
           release_tag=v$release_version
@@ -66,4 +65,5 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           name: v${{ env.RELEASE_VERSION }}
+          tag_name: v${{ env.RELEASE_VERSION }}
           generate_release_notes: true
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f6068fe8cd..1cd35e810b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Budibase Release
 on:
  push:
     branches:
-      - master
+      - test
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
@@ -64,18 +64,18 @@ jobs:
       #     -o values.preprod.yaml \
       #     -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml
 
-      # - name: Deploy to Preprod Environment
-      #   uses: deliverybot/helm@v1
-      #   with:
-      #     release: budibase-preprod
-      #     namespace: budibase
-      #     chart: charts/budibase
-      #     token: ${{ github.token }}
-      #     values: |
-      #       globals.appVersion: ${{ steps.previoustag.outputs.tag }}
-      #     value-files: >-
-      #     [
-      #       "charts/budibase/values.yaml"
-      #     ]
-      #   env:
-      #     KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
+      - name: Deploy to Preprod Environment
+        uses: deliverybot/helm@v1
+        with:
+          release: budibase-preprod
+          namespace: budibase
+          chart: charts/budibase
+          token: ${{ github.token }}
+          values: |
+            globals.appVersion: ${{ steps.previoustag.outputs.tag }}
+          value-files: >-
+          [
+            "charts/budibase/values.yaml"
+          ]
+        env:
+          KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
diff --git a/package.json b/package.json
index 63de8251d4..93bf843622 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "build": "lerna run build",
     "publishdev": "lerna run publishdev",
     "publishnpm": "yarn build && lerna publish --force-publish",
-    "release": "yarn build && lerna publish patch --yes --force-publish",
+    "release": "lerna publish patch --yes --force-publish",
     "release:develop": "yarn build && lerna publish prerelease --yes --force-publish --dist-tag develop",
     "restore": "yarn run clean && yarn run bootstrap && yarn run build",
     "nuke": "yarn run nuke:packages && yarn run nuke:docker",