Merge pull request #748 from GetStream/develop

Next release

Author: tsirlucas

.github/workflows/changelog-preview.yml

@@ -13,27 +13,35 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: develop
-          # pulls all commits (needed for lerna / semantic release to correctly version)
+          # pulls all commits (needed for semantic release to correctly version)
           fetch-depth: '0'
-      # pulls all tags (needed for lerna / semantic release to correctly version)
+      # pulls all tags (needed for semantic release to correctly version)
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: 'https://registry.npmjs.org'
       - name: Installation
-        run: yarn && yarn lerna exec yarn install
+        run: yarn --frozen-lockfile && yarn bootstrap-ci
       - name: Generate Changelog
         id: generate_changelog
         run: |
-          yarn lerna version prerelease --conventional-commits --conventional-prerelease --preid rc --no-git-tag-version --no-push --yes
-          CHANGELOG_PREVIEW=$(bash ./extractVersionChanges.sh)
-          CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW//'%'/'%25'}"
-          CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW_ESCAPED//$'\n'/'%0A'}"
-          CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW_ESCAPED//$'\r'/'%0D'}"
+          GITHUB_REF='refs/heads/develop' yarn extract-changelog
+          echo "Changelog script finished! Checking if there are changes..."
+          CHANGELOG_PREVIEW=$(cat NEXT_RELEASE_CHANGELOG.md || true)
 
           if [[ ! -z "${CHANGELOG_PREVIEW}" ]]; then
+            echo "Changelog found! Writing header to the file..."
+            echo '# Next releases' | cat - NEXT_RELEASE_CHANGELOG.md > NEXT_RELEASE_CHANGELOG.tmp.md && mv NEXT_RELEASE_CHANGELOG.tmp.md NEXT_RELEASE_CHANGELOG.md
+
+            echo "Changelog file ready! Setting up outputs"
+            CHANGELOG_PREVIEW=$(cat NEXT_RELEASE_CHANGELOG.md)
+            
+            CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW//'%'/'%25'}"
+            CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW_ESCAPED//$'\n'/'%0A'}"
+            CHANGELOG_PREVIEW_ESCAPED="${CHANGELOG_PREVIEW_ESCAPED//$'\r'/'%0D'}"
+
             echo "::set-output name=exists::true"
             echo "::set-output name=preview::$CHANGELOG_PREVIEW_ESCAPED"
           fi

.github/workflows/next-release.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - develop
-    paths:
-      - package/**
 
 jobs:
   publish-next:
@@ -16,9 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          # pulls all commits (needed for lerna / semantic release to correctly version)
+          # pulls all commits (needed for semantic release to correctly version)
           fetch-depth: '0'
-      # pulls all tags (needed for lerna / semantic release to correctly version)
+      # pulls all tags (needed for semantic release to correctly version)
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
@@ -30,11 +28,10 @@ jobs:
           git config --global user.name "Vishal Narkhede"
           git config --global user.email "[email protected]"
       - name: Installation
-        run: yarn && yarn lerna exec yarn install
+        run: yarn --frozen-lockfile && yarn bootstrap-ci
       - name: Lint
-        run: yarn lerna exec yarn lint-fix
-      - name: Publish Next release
-        run: |
-          yarn lerna publish prerelease --conventional-commits --conventional-prerelease --no-private --no-push --no-git-tag-version --dist-tag next --preid next.${GITHUB_SHA::7} --no-verify-access --force-publish="*" --yes
+        run: yarn lerna-workspaces run lint-fix
+      - name: Publish Next Release
+        run: GITHUB_SHORT_SHA="$(git rev-parse --short $GITHUB_SHA)" yarn release-next
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/release-candidate.yml renamed to .github/workflows/rc-release.yml

@@ -6,18 +6,17 @@ on:
       - master
 
 jobs:
-  publish-release-candidate:
+  publish-rc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [12.x]
     steps:
       - uses: actions/checkout@v2
         with:
-          # pulls all commits (needed for lerna / semantic release to correctly version)
+          # pulls all commits (needed for semantic release to correctly version)
           fetch-depth: '0'
-          token: ${{ secrets.VERSION_BUMP_TOKEN }}
-      # pulls all tags (needed for lerna / semantic release to correctly version)
+      # pulls all tags (needed for semantic release to correctly version)
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
@@ -29,12 +28,11 @@ jobs:
           git config --global user.name "Vishal Narkhede"
           git config --global user.email "[email protected]"
       - name: Installation
-        run: yarn --frozen-lockfile && yarn lerna exec "yarn install --frozen-lockfile"
+        run: yarn --frozen-lockfile && yarn bootstrap-ci
       - name: Lint
-        run: yarn lerna exec yarn lint-fix
+        run: yarn lerna-workspaces run lint-fix
       - name: Publish Release Candidate
-        run: |
-          yarn lerna publish prerelease --conventional-commits --conventional-prerelease --preid rc --dist-tag rc --no-verify-access --yes
+        run: yarn release-rc
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
           GH_TOKEN: ${{ secrets.VERSION_BUMP_TOKEN }}

.github/workflows/release.yml

@@ -12,11 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          # pulls all commits (needed for lerna / semantic release to correctly version)
-          ref: master
+          # pulls all commits (needed for semantic release to correctly version)
           fetch-depth: '0'
-          token: ${{ secrets.VERSION_BUMP_TOKEN }}
-      # pulls all tags (needed for lerna / semantic release to correctly version)
+      # pulls all tags (needed for semantic release to correctly version)
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
@@ -28,29 +26,14 @@ jobs:
           git config --global user.name "Vishal Narkhede"
           git config --global user.email "[email protected]"
       - name: Installation
-        run: yarn --frozen-lockfile && yarn lerna exec "yarn install --frozen-lockfile"
+        run: yarn --frozen-lockfile && yarn bootstrap-ci
       - name: Lint
-        run: yarn lerna exec yarn lint-fix
-      - name: Publish release
-        run: |
-          yarn lerna publish --conventional-commits --conventional-graduate --create-release github --no-verify-access --yes
+        run: yarn lerna-workspaces run lint-fix
+      - name: Publish Release
+        run: yarn release
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
           GH_TOKEN: ${{ secrets.VERSION_BUMP_TOKEN }}
-      - name: Extract latest SDK tag
-        id: extract_tags
-        run: |
-          GENERATED_SDK_TAG=$(git describe --match "stream-chat-react-native-core@*" --abbrev=0 --tags)
-          PARSED_SDK_TAG="v$(echo "$GENERATED_SDK_TAG" | sed -e 's/stream-chat-react-native-core@//g')"
-          echo "::set-output name=tag::$GENERATED_SDK_TAG"
-          echo "::set-output name=newtag::$PARSED_SDK_TAG"
-      - name: Rename release
-        uses: meeDamian/[email protected]
-        with:
-          token: ${{ secrets.VERSION_BUMP_TOKEN }}
-          tag: ${{ steps.extract_tags.outputs.tag }}
-          name: ${{ steps.extract_tags.outputs.newtag }}
-          allow_override: true
       - name: Merge back changes
         run: |
           git stash

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+NEXT_RELEASE_CHANGELOG.md

README.md

@@ -168,7 +168,7 @@ We welcome code changes that improve this library or fix a problem, and please m
 
 ## Git flow & Release process
 
-We enforce conventional commits and have an automated releasing process using lerna. Read our [git flow & release process guide](https://github.com/GetStream/stream-chat-react-native/blob/master/RELEASE_PROCESS.md) for more information
+We enforce conventional commits and have an automated releasing process using workspaces and semantic-release. Read our [git flow & release process guide](https://github.com/GetStream/stream-chat-react-native/blob/master/RELEASE_PROCESS.md) for more information
 
 ## We are hiring
 

RELEASE_PROCESS.md

@@ -1,9 +1,8 @@
 # Release process
 
-## Lerna
+## Workspaces & semantic-release
 
-We use lerna to manage the release process for our SDK and SampleApp. It has an option for conventional commits and we use it on every commit and pull request
-title so we can have automatically generated tags and changelogs. 
+We use workspaces and semantic-release to manage the release process for our SDK and SampleApp. It enforces conventional commits on every commit and pull request title so we can have automatically generated tags and changelogs. 
 
 ## Angular conventional commits
 
@@ -12,7 +11,7 @@ Also, we enforce that our pull request titles follow the spec because we only co
 
 ## Creating breaking changes
 
-Please follow [the spec](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#commit-message-with-description-and-breaking-change-in-body) when adding breaking changes. Have in mind that the `!` in the commit message is not really supported from lerna yet so avoid that and just add the `BREAKING CHANGE:` flag to the commit body. As explained in the last section, you have two ways to trigger breaking changes: On commit level and on pull request level. The recommended is to do it at commit level in order to be more specific on whats breaking and which commits is generating the breaking change, but if thats not possible for some reason, you need to add it to the pull request merge body.
+Please follow [the spec](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#commit-message-with-description-and-breaking-change-in-body) when adding breaking changes. Have in mind that the `!` in the commit message is not really supported yet so avoid that and just add the `BREAKING CHANGE:` flag to the commit body. As explained in the last section, you have two ways to trigger breaking changes: On commit level and on pull request level. The recommended is to do it at commit level in order to be more specific on whats breaking and which commits is generating the breaking change, but if thats not possible for some reason, you need to add it to the pull request merge body.
 
 ![image](https://user-images.githubusercontent.com/18744505/124764512-69f17c00-df0b-11eb-9747-c46127fba32d.png)
 

changelog-preset.config.js

@@ -2,8 +2,8 @@
 
 set -e
 
-if ! yarn lerna run lint; then
-    yarn lerna run lint-fix
+if ! yarn lerna-workspaces run lint; then
+    yarn lerna-workspaces run lint-fix
     echo "some files were not formatted correctly (prettier/eslint) commit aborted!"
     echo "your changes are still staged, you can accept formatting changes with git add or ignore them by adding --no-verify to git commit"
     exit 1

dotgit/hooks/pre-commit-format.sh

@@ -1,8 +1,5 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
 ## [0.0.25](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@0.0.25) (2021-07-13)
 
 **Note:** Version bump only for package SampleApp