From bb3533dffd8a9ab3056a9e416a1f4a7ee6590a96 Mon Sep 17 00:00:00 2001
From: David Seveloff <davids@elementor.com>
Date: Tue, 11 Jul 2023 17:49:36 +0300
Subject: [PATCH] ED-11261

---
 .github/workflows/bi-weekly-release/action.yml |  3 ++-
 .github/workflows/daily-hosting-release.yml    | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bi-weekly-release/action.yml b/.github/workflows/bi-weekly-release/action.yml
index ee173303f94..f9a21c9b981 100644
--- a/.github/workflows/bi-weekly-release/action.yml
+++ b/.github/workflows/bi-weekly-release/action.yml
@@ -4,7 +4,7 @@ inputs:
   CHANNEL:
     required: true
     description: "The channel to get the version to (cloud, CCU)."
-  LAST_RELEASE_DATE:
+  LAST_AUTOMATED_RELEASE:
     required: false
     description: "The date of the last release."
 
@@ -13,6 +13,7 @@ runs:
   steps:
     - shell: bash
       run: |
+        echo "LAST_AUTOMATED_RELEASE=${{ inputs.LAST_AUTOMATED_RELEASE }}" >> $GITHUB_ENV
         last_release=$(git ls-remote --tags | grep -v "\-rc" | grep -v "refs/tags/v" | grep "cloud" | tail -n1 | awk ‘{print $2}’)
         current_date=$(date +%s)
         release_date=$(git log -1 --format=%ct $last_release)
diff --git a/.github/workflows/daily-hosting-release.yml b/.github/workflows/daily-hosting-release.yml
index db71a75f39c..18e83881778 100644
--- a/.github/workflows/daily-hosting-release.yml
+++ b/.github/workflows/daily-hosting-release.yml
@@ -40,11 +40,11 @@ jobs:
         with:
           CHANNEL: ${{ env.CHANNEL }}
           REF: ${{ github.ref }}
-#      - name: Check if two weeks have passed since last release
-#        uses: ./.github/workflows/bi-weekly-release
-#        with:
-#          CHANNEL: ${{ env.CHANNEL }}
-#          LAST_RELEASE_DATE: ${{ env.LAST_RELEASE_DATE }}
+      - name: Check if two weeks have passed since last release
+        uses: ./.github/workflows/bi-weekly-release
+        with:
+          CHANNEL: ${{ env.CHANNEL }}
+          LAST_AUTOMATED_RELEASE: ${{ env.LAST_AUTOMATED_RELEASE }}
       - name: Bump Channel Version
         uses: ./.github/workflows/bump-channel-version
         with:
@@ -55,7 +55,7 @@ jobs:
         run: |
           npm ci
       - name: Install Octokit
-#        if: ${{ env.CHANNEL == 'cloud' &&  }}
+        if: ${{ env.CHANNEL }} == 'cloud' &&  ${{ github.EVENT_NAME }} == 'schedule'
         run: npm install octokit@2.0.19
       - name: Set Oktokit env variables
         run: |