fix: Make sure our bot is used for released

.changeset/config.json

@@ -8,7 +8,7 @@
   "fixed": [],
   "linked": [],
   "access": "public",
-  "baseBranch": "main",
+  "baseBranch": "origin/main",
   "updateInternalDependencies": "patch",
   "ignore": [
     "@react-native-async-storage/eslint-config",

.github/scripts/setup-ci-git-user.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ -z ${CI+x} ]
+then
+  # not on CI
+  exit 0
+fi
+
+if [ -z ${GITHUB_NAME+x} ] || [ -z ${GITHUB_EMAIL+x} ] || [ -z ${GITHUB_TOKEN+x} ]
+then
+  echo "Make sure GITHUB_NAME, GITHUB_EMAIL and GITHUB_TOKEN variables are set"
+  exit 1
+fi
+
+git config --global user.name "$GITHUB_NAME"
+git config --global user.email "$GITHUB_EMAIL"
+echo "machine github.com login $GITHUB_NAME password $GITHUB_TOKEN" > ~/.netrc
+
+

.github/workflows/release.yml

@@ -12,10 +12,6 @@ jobs:
         uses: ./.github/actions/setup-project
       - name: Install dependencies
         run: yarn
-      - name: Setup git user
-        run: |
-          git config --global user.name ${{ secrets.GH_BOT_NAME }}
-          git config --global user.email ${{ secrets.GH_BOT_EMAIL }}
       - name: Version or release packages
         uses: changesets/action@v1
         with:
@@ -26,4 +22,6 @@ jobs:
           version: "yarn release:version"
         env:
           GITHUB_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
+          GITHUB_NAME: ${{ secrets.GH_BOT_NAME }}
+          GITHUB_EMAIL: ${{ secrets.GH_BOT_EMAIL }}
           NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}

.github/workflows/website-deployment.yml

@@ -19,10 +19,15 @@ jobs:
       - name: Install dependencies
         run: yarn
         working-directory: ./packages/website
+      - name: Setup git user
+        run: setup-ci-git-user.sh
+        working-directory: ./.github/scripts
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
+          GITHUB_NAME: ${{ secrets.GH_BOT_NAME }}
+          GITHUB_EMAIL: ${{ secrets.GH_BOT_EMAIL }}
       - name: Deploy
-        run: |
-          git config --global user.name ${{ secrets.GH_BOT_NAME }}
-          git config --global user.email ${{ secrets.GH_BOT_EMAIL }}
-          echo "machine github.com login ${{ secrets.GH_BOT_NAME }} password ${{ secrets.GH_RELEASE_TOKEN }}" > ~/.netrc
-          GIT_USER=${{ secrets.GH_BOT_NAME }} yarn run deploy
+        env:
+          GIT_USER: ${{ secrets.GH_BOT_NAME }}
+        run: yarn run deploy
         working-directory: ./packages/website

package.json

@@ -16,8 +16,8 @@
     "test:lint": "turbo run test:lint",
     "test:ts": "turbo run test:ts",
     "test:format": "prettier --check --loglevel warn $(git ls-files '*.js' '*.json' '*.ts' '*.tsx' '*.yml' 'README.md')",
-    "release:version": "changeset version",
-    "release:publish": "changeset publish"
+    "release:version": "./.github/scripts/setup-ci-git-user.sh && changeset version",
+    "release:publish": "./.github/scripts/setup-ci-git-user.sh && changeset publish"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",