Merge branch 'main' into dev

Author: Niraj-Kamdar

.github/workflows/cd.yaml

@@ -1,24 +1,27 @@
 name: CD
 on:
+  push:
+    branches:
+      - main
   # When Pull Request is merged
-  pull_request_target:
-    types: [closed]
+  # pull_request_target:
+  #   types: [closed]
 
 jobs:
   GetVersion:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     outputs:
       version: ${{ env.RELEASE_VERSION }}
-    if: |
-      github.event.pull_request.user.login == 'polywrap-build-bot' &&
-      github.event.pull_request.merged == true
+    # if: |
+    #   github.event.pull_request.user.login == 'polywrap-build-bot' &&
+    #   github.event.pull_request.merged == true
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Halt release if CI failed
-        run: exit 1
-        if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+      # - name: Halt release if CI failed
+      #   run: exit 1
+      #   if: ${{ github.event.workflow_run.conclusion == 'failure' }}
       - name: Read VERSION into env.RELEASE_VERSION
         run: echo RELEASE_VERSION=$(cat VERSION) >> $GITHUB_ENV
       - name: Check if tag Exists
@@ -65,19 +68,25 @@ jobs:
           prerelease: false
 
   Dev-PR:
-    needs: Pre-Check
+    needs:
+      - GetVersion
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: dev
+          fetch-depth: 0
 
-      - name: Merge main into dev
+      - name: Set Git Identity
         run: |
           git config --global user.name '${{env.BUILD_BOT}}'
-          git config --global user.email '${{ env.BUILD_BOT }}@users.noreply.github.com'
-          git merge main
+          git config --global user.email '${{env.BUILD_BOT}}@users.noreply.github.com'
+        env:
+          GITHUB_TOKEN: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
+
+      - name: Merge main into dev
+        run: git merge origin/main
 
       - name: set env.RELEASE_FORKS to Release Forks' Organization
         run: echo RELEASE_FORKS=polywrap-release-forks >> $GITHUB_ENV
@@ -88,59 +97,31 @@ jobs:
       - name: Read VERSION into env.RELEASE_VERSION
         run: echo RELEASE_VERSION=$(cat VERSION) >> $GITHUB_ENV
 
-      - name: Building Dev PR...
-        uses: actions/github-script@0.8.0
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '[Building Dev PR](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}) after Version (`${{env.RELEASE_VERSION}}`) Release.'
-            })
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
+      # - name: Set up Python 3.10
+      #   uses: actions/setup-python@v4
+      #   with:
+      #     python-version: "3.10"
 
-      - name: Install tomlkit
-        run: pip3 install tomlkit
+      # - name: Install poetry
+      #   run: curl -sSL https://install.python-poetry.org | python3 -
 
-      - name: Set Git Identity
-        run: |
-          git config --global user.name '${{env.BUILD_BOT}}'
-          git config --global user.email '${{env.BUILD_BOT}}@users.noreply.github.com'
-        env:
-          GITHUB_TOKEN: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
+      # - name: Install tomlkit
+      #   run: pip3 install tomlkit
 
-      - name: Link Packages in dev branch
-        run: python3 scripts/link_packages.py
+      # - name: Link Packages in dev branch
+      #   run: python3 scripts/link_packages.py
 
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
           push-to-fork: ${{env.RELEASE_FORKS}}/${{github.event.pull_request.base.repo.name}}
-          branch: release/origin-dev-${{env.RELEASE_VERSION}}
-          base: dev
+          # branch: post-release/origin-${{env.RELEASE_VERSION}}
+          # base: origin/dev
           committer: GitHub <noreply@github.com>
           author: ${{env.BUILD_BOT}} <${{env.BUILD_BOT}}@users.noreply.github.com>
-          commit-message: "${{env.RELEASE_VERSION}}"
+          commit-message: "DEV ${{env.RELEASE_VERSION}}"
           title: 'Link packages in dev after (${{env.RELEASE_VERSION}})'
           body: |
             ## Link packages in dev after (${{env.RELEASE_VERSION}})
-
-      - name: Release PR Created...
-        uses: actions/github-script@0.8.0
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '**[Release PR Created](https://github.com/${{github.repository}}/pull/${{ steps.cpr.outputs.pull-request-number }}) (`${{env.RELEASE_VERSION}}`)**'
-            })