Merge pull request #140 from polywrap/dev

prep 0.1.0a22 | /workflows/cd

Author: Niraj-Kamdar

.github/workflows/cd.yaml

@@ -84,7 +84,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          ref: ${{github.event.pull_request.base.ref}}
 
       - name: Set env.BUILD_BOT to Build Bot's Username
         run: echo BUILD_BOT=polywrap-build-bot >> $GITHUB_ENV
@@ -125,26 +125,19 @@ jobs:
         env:
           POLYWRAP_BUILD_BOT_PYPI_PAT: ${{ secrets.POLYWRAP_BUILD_BOT_PYPI_PAT }}
 
-      - name: Commit Version Changes
-        run: |
-          git add .
-          git commit -m "chore: patch version to ${{env.RELEASE_VERSION}}" --allow-empty
-        continue-on-error: true
-
       - name: Create Pull Request from dev to main
         id: cpr-cd
         uses: peter-evans/create-pull-request@v3
         with:
           branch: cd/${{env.RELEASE_VERSION}}
-          base: main
           committer: GitHub <noreply@github.com>
           author: ${{env.BUILD_BOT}} <${{env.BUILD_BOT}}@users.noreply.github.com>
           commit-message: "chore: patch version to ${{env.RELEASE_VERSION}}"
           title: 'Python client CD (${{env.RELEASE_VERSION}})'
           body: |
             ## Python client CD (${{env.RELEASE_VERSION}})
 
-      - name: Release PR Created...
+      - name: CD PR Created...
         uses: actions/github-script@0.8.0
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
@@ -156,62 +149,6 @@ jobs:
               body: '**[Release PR Created](https://github.com/${{github.repository}}/pull/${{ steps.cpr-cd.outputs.pull-request-number }}) (`${{env.RELEASE_VERSION}}`)**'
             })
 
-      - name: Building POST CD 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 POST CD PR](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}) (`${{env.RELEASE_VERSION}}`)'
-            })
-
-      - name: Link Packages in dev branch
-        run: python3 scripts/link_packages.py
-
-      - name: Commit Linking Changes
-        run: |
-          git add .
-          git commit -m "chore: link dependencies post ${{env.RELEASE_VERSION}} release" --allow-empty
-        continue-on-error: true
-
-      - name: Create Pull Request from main to dev
-        id: cpr-post-cd
-        uses: peter-evans/create-pull-request@v3
-        with:
-          branch: post-cd/${{env.RELEASE_VERSION}}
-          base: dev
-          committer: GitHub <noreply@github.com>
-          author: ${{env.BUILD_BOT}} <${{env.BUILD_BOT}}@users.noreply.github.com>
-          commit-message: "chore: link dependencies post ${{env.RELEASE_VERSION}} release"
-          title: 'Python client POST CD (${{env.RELEASE_VERSION}})'
-          body: |
-            ## Python client POST CD (${{env.RELEASE_VERSION}})
-
-      - name: POST CD 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: '**[POST CD PR Created](https://github.com/${{github.repository}}/pull/${{ steps.cpr-post-cd.outputs.pull-request-number }}) (`${{env.RELEASE_VERSION}}`)**'
-            })
-
-  Github-release:
-    needs: 
-      - Pre-Check
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Read VERSION into env.RELEASE_VERSION
-        run: echo RELEASE_VERSION=$(cat VERSION) >> $GITHUB_ENV
       - id: changelog
         name: "Generate release changelog"
         uses: heinrichreimer/github-changelog-generator-action@v2.3
@@ -220,7 +157,8 @@ jobs:
           unreleasedLabel: ${{ env.RELEASE_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
         continue-on-error: true
-      - name: Create Release
+
+      - name: Create GitHub Release
         id: create_release
         uses: actions/create-release@v1
         env:

.github/workflows/post-cd.yaml

@@ -0,0 +1,60 @@
+name: CD
+on:
+  # When Pull Request is merged
+  pull_request_target:
+    types: [closed]
+
+jobs:
+  Dev-PR:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: dev
+          fetch-depth: 0
+
+      - 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: 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
+
+      - name: Set env.BUILD_BOT to Build Bot's Username
+        run: echo BUILD_BOT=polywrap-build-bot >> $GITHUB_ENV
+
+      - name: Read VERSION into env.RELEASE_VERSION
+        run: echo RELEASE_VERSION=$(cat VERSION) >> $GITHUB_ENV
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install poetry
+        run: curl -sSL https://install.python-poetry.org | python3 -
+
+      - name: Install tomlkit
+        run: pip3 install tomlkit
+
+      - name: Link Packages in dev branch
+        run: python3 scripts/link_packages.py
+
+      - name: Create Pull Request from main to dev
+        id: cpr-post-cd
+        uses: peter-evans/create-pull-request@v3
+        with:
+          branch: post-cd/${{env.RELEASE_VERSION}}
+          committer: GitHub <noreply@github.com>
+          author: ${{env.BUILD_BOT}} <${{env.BUILD_BOT}}@users.noreply.github.com>
+          commit-message: "chore: link dependencies post ${{env.RELEASE_VERSION}} release"
+          title: 'Python client POST CD (${{env.RELEASE_VERSION}})'
+          body: |
+            ## Python client POST CD (${{env.RELEASE_VERSION}})

VERSION

@@ -1 +1 @@
-0.1.0a21
+0.1.0a22