Update master branch from original repo

.circleci/config.yml

@@ -19,6 +19,21 @@ commands:
           paths:
             - ~/.npm
             - i18n-cache/data
+  npm-install-full:
+    steps:
+      - restore_cache:
+          name: Restore NPM Cache
+          keys:
+            - npm-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "gutenberg/package-lock.json" }}
+      - run:
+          name: NPM Install Full
+          command: npm install
+      - save_cache:
+          name: Save NPM Cache
+          key: npm-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "gutenberg/package-lock.json" }}
+          paths:
+            - ~/.npm
+            - i18n-cache/data
   checkout-submodules:
     steps:
       - run:
@@ -47,7 +62,14 @@ jobs:
     steps:
       - checkout
       - checkout-submodules
-      - npm-install
+      - when:
+          condition: <<parameters.check-correctness>>
+          steps:
+            - npm-install-full
+      - unless:
+          condition: <<parameters.check-correctness>>
+          steps:
+            - npm-install
       - add-jest-reporter-dir
       - run:
           name: Set Environment Variables
@@ -162,7 +184,7 @@ jobs:
         - dependencies-v4-
     - run:
         name: Build (if needed)
-        command: test -e ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app || SKIP_BUNDLING=true npm run core test:e2e:build-app:ios
+        command: test -e gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/gutenberg.app || SKIP_BUNDLING=true npm run core test:e2e:build-app:ios
     - save_cache:
         name: Save Dependencies Cache
         key: dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}-{{ checksum "gutenberg/package-lock.json" }}
@@ -176,12 +198,12 @@ jobs:
         command: npm run test:e2e:bundle:ios
     - run:
         name: Generate .app file for testing
-        command: WORK_DIR=$(pwd) && cd ./gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator && zip -r $WORK_DIR/gutenberg/packages/react-native-editor/ios/GutenbergDemo.app.zip GutenbergDemo.app
+        command: WORK_DIR=$(pwd) && cd ./gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator && zip -r $WORK_DIR/gutenberg/packages/react-native-editor/ios/gutenberg.app.zip gutenberg.app
     - run:
         name: Upload .app to sauce labs
         command: |
           source bin/sauce-pre-upload.sh
-          curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.app.zip?overwrite=true --data-binary @./gutenberg/packages/react-native-editor/ios/GutenbergDemo.app.zip
+          curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.app.zip?overwrite=true --data-binary @./gutenberg/packages/react-native-editor/ios/gutenberg.app.zip
     - run:
         name: Run Device Tests
         command: |
@@ -193,12 +215,12 @@ jobs:
         path: ./reports/test-results
     - run:
         name: Prepare build cache
-        command: rm gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle
+        command: rm gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/gutenberg.app/main.jsbundle
     - save_cache:
         name: Save Build Cache
         key: ios-build-cache-{{ checksum "ios-checksums.txt" }}
         paths:
-          - gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app
+          - gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/gutenberg.app
     - when:
           condition: << parameters.post-to-slack >>
           steps:

Gutenberg.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.preserve_paths = 'bundle/ios/*'
   s.swift_version = '5.0'
-  s.resources = 'gutenberg/packages/react-native-bridge/common/**/*.{js,css,json}', 'resources/**/*.js'
+  s.resources = ['gutenberg/packages/react-native-bridge/common/**/*.{js,css,json}', 'src/block-support/supported-blocks.json', 'resources/**/*.js']
 
   s.dependency 'React', react_native_version
   s.dependency 'React-CoreModules', react_native_version

bin/ci-checks-js.sh

@@ -1,19 +1,35 @@
 function pOk() {
-  echo "[$(tput setaf 2)OK$(tput sgr0)]"
+  echo "[OK]"
 }
 
 function pFail() {
-  echo "[$(tput setaf 1)KO$(tput sgr0)]"
+  if [ -n "$1" ]
+  then
+    echo "Message: $1"
+  fi
+  echo "[KO]"
   exit 1
 }
 
+function checkDiff() {
+  diff=$(git diff)
+  if [[ $? != 0 ]]; then
+    pFail
+  elif [[ $diff ]]; then
+    pFail "package-lock.json has changed. Please run npm install and commit the diff"
+  else
+    pOk
+  fi
+}
+
 # if both env variables are missing then force them to `true`. Otherwise will respect the combination passed externally
 if [[ -z "${CHECK_CORRECTNESS}" ]] && [[ -z "${CHECK_TESTS}" ]] ; then
   CHECK_CORRECTNESS=true
   CHECK_TESTS=true
 fi
 
 if [ "$CHECK_CORRECTNESS" = true ] ; then
+  checkDiff
   npm run lint || pFail
 fi
 

bin/release_automation.sh

@@ -6,6 +6,8 @@
 # - Release is being created off of a clean branch
 # - Whether there are any open PRs targeting the milestone for the release
 
+set -e
+
 # Execute script commands from project's root directory
 SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd "$SCRIPT_PATH/.."
@@ -48,9 +50,11 @@ if [[ -z "$VERSION_NUMBER" ]]; then
 fi
 
 # Ensure javascript dependencies are up-to-date
-ohai "Run 'npm ci' to ensure javascript dependencies are up-to-date"
-execute "npm" "ci"
-
+read -p "Run 'npm ci' to ensure javascript dependencies are up-to-date? (y/n) " -n 1
+echo ""
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+    execute "npm" "ci"
+fi
 
 # If there are any open PRs with a milestone matching the release version number, notify the user and ask them if they want to proceed
 number_milestone_prs=$(check_if_version_has_pending_prs_for_milestone "$VERSION_NUMBER")
@@ -195,26 +199,39 @@ cd "$TEMP_WP_ANDROID_DIRECTORY"
 
 execute "git" "submodule" "update" "--init" "--recursive" "--depth=1" "--recommend-shallow"
 
+ohai "Create after_x.xx.x branch in WordPress-Android"
+execute "git" "switch" "-c" "gutenberg/after_$VERSION_NUMBER" 
+
+# Insure PR is created on proper remote
+# see https://github.com/cli/cli/issues/800
+WP_ANDROID_BASE_REMOTE=$(get_remote_name 'wordpress-mobile/WordPress-Android')
+execute "git" "push" "-u" "$WP_ANDROID_BASE_REMOTE" "HEAD"
+
 ohai "Create release branch in WordPress-Android"
 execute "git" "switch" "-c" "gutenberg/integrate_release_$VERSION_NUMBER" 
 
 ohai "Update gutenberg-mobile ref"
 cd libs/gutenberg-mobile
 execute "git" "fetch" "--recurse-submodules=no" "origin" "$GB_MOBILE_PR_REF"
 execute "git" "checkout" "$GB_MOBILE_PR_REF"
+execute "git" "submodule" "update"
 cd ../..
 
 execute "git" "add" "libs/gutenberg-mobile"
 execute "git" "commit" "-m" "Release script: Update gutenberg-mobile ref"
 
 ohai "Update strings"
 execute "python" "tools/merge_strings_xml.py"
-execute "git" "add" "WordPress/src/main/res/values/strings.xml"
-execute "git" "commit" "-m" "Release script: Update strings"
+# If merge_strings_xml.py results in changes, commit them
+if [[ ! -z "$(git status --porcelain)" ]]; then
+    ohai "Commit changes from 'python tools/merge_strings_xml.py'"
+    execute "git" "add" "WordPress/src/main/res/values/strings.xml"
+    execute "git" "commit" "-m" "Release script: Update strings"
+else
+    ohai "There were no changes from 'python tools/merge_strings_xml.py' to be committed."
+fi
 
-# Insure PR is created on proper remote
-# see https://github.com/cli/cli/issues/800
-WP_ANDROID_BASE_REMOTE=$(get_remote_name 'wordpress-mobile/WordPress-android')
+ohai "Push integration branch"
 execute "git" "push" "-u" "$WP_ANDROID_BASE_REMOTE" "HEAD"
 
 WP_ANDROID_PR_BODY="## Description
@@ -223,13 +240,14 @@ For more information about this release and testing instructions, please see the
 
 Release Submission Checklist
 
-- [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary."
+- [ ] I have considered if this change warrants user-facing release notes and have added them to \`RELEASE-NOTES.txt\` if necessary."
 
 # Create Draft WPAndroid Release PR in GitHub
 ohai "Create Draft WPAndroid Release PR in GitHub"
 WP_ANDROID_PR_URL=$(execute "gh" "pr" "create" "--title" "Integrate gutenberg-mobile release $VERSION_NUMBER" "--body" "$WP_ANDROID_PR_BODY" "--base" "develop" "--label" "gutenberg-mobile" "--draft")
 
 ohai "WPAndroid PR Created: $WP_ANDROID_PR_URL"
+echo ""
 
 
 #####
@@ -242,21 +260,27 @@ execute "git" "clone" "--depth=1" "[email protected]:wordpress-mobile/WordPress-iOS
 
 cd "$TEMP_WP_IOS_DIRECTORY"
 
+ohai "Create after_x.xx.x branch in WordPress-iOS"
+execute "git" "switch" "-c" "gutenberg/after_$VERSION_NUMBER" 
+
+# Insure PR is created on proper remote
+# see https://github.com/cli/cli/issues/800
+WP_IOS_BASE_REMOTE=$(get_remote_name 'wordpress-mobile/WordPress-iOS')
+execute "git" "push" "-u" "$WP_IOS_BASE_REMOTE" "HEAD"
+
 ohai "Create release branch in WordPress-iOS"
 execute "git" "switch" "-c" "gutenberg/integrate_release_$VERSION_NUMBER" 
 
 ohai "Update gutenberg-mobile ref"
 test -f "Podfile" || abort "Error: Could not find Podfile"
-sed -i'.orig' -E "s/gutenberg :commit => '(.*)'/gutenberg :commit => '$GB_MOBILE_PR_REF'/" Podfile || abort "Error: Failed updating gutenberg ref in Podfile"
+sed -i'.orig' -E "s/gutenberg :(commit|tag) => '(.*)'/gutenberg :commit => '$GB_MOBILE_PR_REF'/" Podfile || abort "Error: Failed updating gutenberg ref in Podfile"
 execute "rake" "dependencies"
 
 
 execute "git" "add" "Podfile" "Podfile.lock"
 execute "git" "commit" "-m" "Release script: Update gutenberg-mobile ref"
 
-# Insure PR is created on proper remote
-# see https://github.com/cli/cli/issues/800
-WP_IOS_BASE_REMOTE=$(get_remote_name 'wordpress-mobile/WordPress-iOS')
+ohai "Push integration branch"
 execute "git" "push" "-u" "$WP_IOS_BASE_REMOTE" "HEAD"
 
 WP_IOS_PR_BODY="## Description
@@ -265,13 +289,14 @@ For more information about this release and testing instructions, please see the
 
 Release Submission Checklist
 
-- [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary."
+- [ ] I have considered if this change warrants user-facing release notes and have added them to \`RELEASE-NOTES.txt\` if necessary."
 
 # Create Draft WPiOS Release PR in GitHub
 ohai "Create Draft WPiOS Release PR in GitHub"
 WP_IOS_PR_URL=$(execute "gh" "pr" "create" "--title" "Integrate gutenberg-mobile release $VERSION_NUMBER" "--body" "$WP_IOS_PR_BODY" "--base" "develop" "--label" "Gutenberg integration" "--draft")
 
 ohai "WPiOS PR Created: $WP_IOS_PR_URL"
+echo ""
 
 echo "Main apps PRs created"
 echo "==========="