ci: updates to fix build/package & produce binaries

.circleci/local_publish_helpers.sh

@@ -5,11 +5,12 @@ [email protected]
 
 function startLocalRegistry {
     # Start local registry
-    tmp_registry_log=$(mktemp)
+    tmp_registry_log="$(mktemp)"
     echo "Registry output file: $tmp_registry_log"
     (cd && nohup npx ${VERDACCIO_PACKAGE:-$default_verdaccio_package} -c $1 &>$tmp_registry_log &)
     # Wait for Verdaccio to boot
-    grep -q 'http address' <(tail -f $tmp_registry_log)
+    sleep 60
+    # grep -q 'http address' <(tail -f $tmp_registry_log)
 }
 
 function uploadPkgCli {

.circleci/publish-codebuild.sh

@@ -95,7 +95,8 @@ elif [[ "$CIRCLE_BRANCH" =~ ^run-e2e-with-rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^r
     force_publish_local_args="--force-publish '@aws-amplify/cli-internal'"
   fi
   # create release commit and release tags
-  git checkout codebuild-poc && npx lerna version --preid=rc.$CODEBUILD_RESOLVED_SOURCE_VERSION --exact --conventional-prerelease --conventional-commits --yes --no-push --include-merged-tags --message "chore(release): Publish rc [ci skip]" $(echo $force_publish_local_args) --no-commit-hooks
+  git checkout "${CODEBUILD_WEBHOOK_TRIGGER#branch/*}" && npx lerna version --preid=rc.$CODEBUILD_RESOLVED_SOURCE_VERSION --exact --conventional-prerelease --conventional-commits --yes --no-push --include-merged-tags --message "chore(release): Publish rc [ci skip]" $(echo $force_publish_local_args) --no-commit-hooks
+
 
   # if publishing locally to verdaccio
   if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
@@ -110,10 +111,10 @@ elif [[ "$CIRCLE_BRANCH" =~ ^run-e2e-with-rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^r
   lernaPublishExitOnFailure from-package --git-head $CODEBUILD_RESOLVED_SOURCE_VERSION --yes --no-push --dist-tag rc
 
   # push release commit
-  git push origin "$CIRCLE_BRANCH"
+  git push origin "${CODEBUILD_WEBHOOK_TRIGGER#branch/*}"
 
   # push release tags
   git tag --points-at HEAD | xargs git push origin
 else
-  echo "branch name" "$CIRCLE_BRANCH" "did not match any branch publish rules. Skipping publish"
+  echo "branch name" "${CODEBUILD_WEBHOOK_TRIGGER#branch/*}" "did not match any branch publish rules. Skipping publish"
 fi

codebuild_specs/publish_to_local_registry.yml

@@ -4,7 +4,7 @@ env:
 phases:
   build:
     commands:
-      - source ./shared-scripts.sh && source ./.circleci/local_publish_helpers.sh && _publishToLocalRegistry
+      - source ./shared-scripts.sh && _publishToLocalRegistry
 
 artifacts:
   files:

codebuild_specs/run_e2e_tests.yml

@@ -1,7 +1,14 @@
 version: 0.2
 env:
   shell: bash
+  variables:
+    CLI_REGION: us-east-1
+    TEST_SUITE: src/__tests__/auth_2b.test.ts
+    AMPLIFY_DIR: $CODEBUILD_SRC_DIR/out
+    AMPLIFY_PATH: $CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64
 phases:
   build:
     commands:
+      - echo $AMPLIFY_DIR
+      - echo $AMPLIFY_PATH
       - source ./shared-scripts.sh && _runE2ETestsLinux

shared-scripts.sh

@@ -168,8 +168,8 @@ function _publishToLocalRegistry {
     loadCache repo $CODEBUILD_SRC_DIR
     loadCache .cache $HOME/.cache
 
-    startLocalRegistry "$CODEBUILD_SRC_DIR/.circleci/verdaccio.yaml"
-    setNpmRegistryUrlToLocal
+    source ./.circleci/local_publish_helpers.sh && startLocalRegistry "$CODEBUILD_SRC_DIR/.circleci/verdaccio.yaml"
+    source ./.circleci/local_publish_helpers.sh && setNpmRegistryUrlToLocal
     export LOCAL_PUBLISH_TO_LATEST=true
     ./.circleci/publish-codebuild.sh
     unsetNpmRegistryUrl
@@ -182,8 +182,15 @@ function _publishToLocalRegistry {
     echo Save new amplify Github tag
     node scripts/echo-current-cli-version.js > .amplify-pkg-version
 
+    echo LS HOME
+    ls $CODEBUILD_SRC_DIR/..
+
+    echo LS REPO
+    ls $CODEBUILD_SRC_DIR
+
     # copy [verdaccio-cache, changelog, pkgtag to s3]
-    storeCache $HOME/verdaccio-cache verdaccio-cache
+    storeCache $CODEBUILD_SRC_DIR/../verdaccio-cache verdaccio-cache
+
     storeCacheFile $CODEBUILD_SRC_DIR/UNIFIED_CHANGELOG.md UNIFIED_CHANGELOG.md
     storeCacheFile $CODEBUILD_SRC_DIR/.amplify-pkg-version .amplify-pkg-version
 }
@@ -199,7 +206,8 @@ function _buildBinaries {
     # download [repo, yarn, verdaccio from s3]
     loadCache repo $CODEBUILD_SRC_DIR
     loadCache .cache $HOME/.cache
-    loadCache verdaccio-cache $HOME/verdaccio-cache
+    loadCache verdaccio-cache $CODEBUILD_SRC_DIR/../verdaccio-cache
+
     loadCacheFile .amplify-pkg-version $CODEBUILD_SRC_DIR/.amplify-pkg-version
     loadCacheFile UNIFIED_CHANGELOG.md $CODEBUILD_SRC_DIR/UNIFIED_CHANGELOG.md
 
@@ -222,14 +230,15 @@ function _runE2ETestsLinux {
 
     loadCache repo $CODEBUILD_SRC_DIR
     loadCache .cache $HOME/.cache
-    loadCache verdaccio-cache $HOME/verdaccio-cache
+    loadCache verdaccio-cache $CODEBUILD_SRC_DIR/../verdaccio-cache
+
     loadCache repo-out $CODEBUILD_SRC_DIR/out
     loadCacheFile .amplify-pkg-version $CODEBUILD_SRC_DIR/.amplify-pkg-version
     loadCacheFile UNIFIED_CHANGELOG.md $CODEBUILD_SRC_DIR/UNIFIED_CHANGELOG.md
 
-    source .circleci/local_publish_helpers.sh
-    source $BASH_ENV
-    startLocalRegistry "$CODEBUILD_SRC_DIR/.circleci/verdaccio.yaml"
+    source .circleci/local_publish_helpers.sh && startLocalRegistry "$CODEBUILD_SRC_DIR/.circleci/verdaccio.yaml"
+    # source $BASH_ENV
+
     setNpmRegistryUrlToLocal
     changeNpmGlobalPath
     amplify version