Merge pull request #651 from aws-amplify/fix-postpublish-sync

fix: post publish sync between main and release

Author: phani-srikar

.codebuild/scripts/publish.sh

@@ -4,8 +4,11 @@ if [ -z "$BRANCH_NAME" ]; then
   echo "BRANCH_NAME is missing"
   exit 1
 else
+  # These are more of an extra caution to make sure we have latest commits
+  git checkout main
+  git pull origin main
   git checkout $BRANCH_NAME
-  git pull
+  git pull origin $BRANCH_NAME
   git fetch --all
   yarn install
   git restore .

packages/amplify-codegen/package.json

@@ -1,7 +1,7 @@
 {
   "name": "amplify-codegen",
   "version": "4.1.7",
-  "description": "Amplify Code generator",
+  "description": "Amplify Code Generator",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws-amplify/amplify-codegen.git",

shared-scripts.sh

@@ -319,7 +319,6 @@ function runE2eTest {
 
 function _deploy {
   echo "Deploy"
-  loadCacheFromBuildJob
   echo "Authenticate with NPM"
   PUBLISH_TOKEN=$(echo "$NPM_PUBLISH_TOKEN" | jq -r '.token')
   echo "//registry.npmjs.org/:_authToken=$PUBLISH_TOKEN" > ~/.npmrc