From bc1d228e9a19048d3b075b8f56f12d48abd45c4d Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 13 Jan 2022 15:17:58 +0100
Subject: [PATCH] use selfhost job definition from master

---
 .github/workflows/release-selfhost.yml | 49 ++++----------------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index add82fb0d1..5223fc6864 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -9,13 +9,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
+        with: 
+          fetch_depth: 0
 
       - name: Tag and release Docker images (Self Host)
-        run: |
+        run: | 
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
 
           # Get latest release version
@@ -30,7 +28,7 @@ jobs:
           # Tag apps and worker images
           docker tag budibase/apps:$release_tag budibase/apps:$SELFHOST_TAG
           docker tag budibase/worker:$release_tag budibase/worker:$SELFHOST_TAG
-
+          
           # Push images
           docker push budibase/apps:$SELFHOST_TAG
           docker push budibase/worker:$SELFHOST_TAG
@@ -38,39 +36,11 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           SELFHOST_TAG: latest
-
-      - name: Setup Helm
+      
+      - name: Setup Helm 
         uses: azure/setup-helm@v1
         id: helm-install
 
-<<<<<<< HEAD
-      - name: Build CLI executables
-        run: |
-          pushd packages/cli
-          yarn
-          yarn build
-          popd
-
-      # - name: Build and release helm chart
-      #   run: |
-      #     git config user.name "Budibase Helm Bot"
-      #     git config user.email "<>"
-      #     mv budibase-${{ env.RELEASE_VERSION }}.tgz docs
-      #     helm repo index docs
-      #     git checkout gh-pages
-      #     git add -A
-      #     git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
-      #     git push
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Deploy
-      #   uses: peaceiris/actions-gh-pages@v3
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-      #     publish_dir: ./public
-      #     full_commit_message: "Helm Release: ${{ env.RELEASE_VERSION }}"
-=======
       - name: Build and release helm chart
         run: | 
           git config user.name "Budibase Helm Bot"
@@ -85,15 +55,10 @@ jobs:
           git push
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> 157877a60444104d17efedf937bc7d48fc3006c5
 
       - name: Perform Github Release
         uses: softprops/action-gh-release@v1
         with:
           name: v${{ env.RELEASE_VERSION }}
           tag_name: v${{ env.RELEASE_VERSION }}
-          generate_release_notes: true
-          files: |
-            packages/cli/build/cli-win.exe
-            packages/cli/build/cli-linux
-            packages/cli/build/cli-macos
\ No newline at end of file
+          generate_release_notes: true
\ No newline at end of file