Merge remote-tracking branch 'origin/trunk' into adam/gravatar_quickeditor

Author: AdamGrzybkowski

.buildkite/beta-builds.yml

@@ -13,6 +13,7 @@ steps:
   #################
   - label: "Gradle Wrapper Validation"
     command: |
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
       validate_gradle_wrapper
     plugins: [$CI_TOOLKIT]
 
@@ -27,14 +28,18 @@ steps:
 
       - label: "🕵️ Lint WordPress"
         key: wplint
-        command: ".buildkite/commands/lint.sh wordpress"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/lint.sh wordpress
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/lint-results*.*"
 
       - label: "🕵️ Lint Jetpack"
         key: jplint
-        command: ".buildkite/commands/lint.sh jetpack"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/lint.sh jetpack
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/lint-results*.*"
@@ -47,7 +52,9 @@ steps:
 
       - label: ":wordpress: :android: Beta Build"
         key: wpbuild
-        command: ".buildkite/commands/beta-build.sh wordpress"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/beta-build.sh wordpress
         depends_on: wplint
         plugins: [$CI_TOOLKIT]
         notify:
@@ -59,7 +66,9 @@ steps:
 
       - label: ":jetpack: :android: Beta Build"
         key: jpbuild
-        command: ".buildkite/commands/beta-build.sh jetpack"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/beta-build.sh jetpack
         depends_on: jplint
         plugins: [$CI_TOOLKIT]
         notify:
@@ -76,5 +85,7 @@ steps:
     depends_on:
       - wpbuild
       - jpbuild
-    command: ".buildkite/commands/create-github-release.sh"
+    command: |
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+      .buildkite/commands/create-github-release.sh
     plugins: [$CI_TOOLKIT]

.buildkite/commands/checkout-editorial-branch.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -eu
 
+echo '--- :git: Checkout Editorial Branch'
+
 # EDITORIAL_BRANCH is passed as an environment variable from fastlane to Buildkite
 #
 if [[ -z "${EDITORIAL_BRANCH}" ]]; then

.buildkite/commands/checkout-release-branch.sh

@@ -1,10 +1,8 @@
 #!/bin/bash -eu
 
-# RELEASE_VERSION is passed as an environment variable passed to Buildkite by ReleasesV2.
-if [[ -z "${RELEASE_VERSION}" ]]; then
-    echo "RELEASE_VERSION is not set."
-    exit 1
-fi
+echo "--- :git: Checkout Release Branch"
+
+RELEASE_VERSION="${1?Please provide a release version as an argument.}"
 
 # Buildkite, by default, checks out a specific commit. For many release actions, we need to be
 # on a release branch instead.

.buildkite/commands/lint.sh

@@ -3,9 +3,6 @@
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :clipboard: Copying gradle.properties"
-cp gradle.properties-example gradle.properties
-
 echo "--- :globe_with_meridians: Check Locales Declaration Consistency"
 bundle exec fastlane check_declared_locales_consistency app:"$1"
 

.buildkite/commands/run-unit-tests.sh

@@ -32,7 +32,6 @@ else
     exit 1
 fi
 
-cp gradle.properties-example gradle.properties
 ./gradlew $test_suite
 TESTS_EXIT_STATUS=$?
 set -e

.buildkite/complete-code-freeze.yml

@@ -8,8 +8,7 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Release Branch'
-      .buildkite/commands/checkout-release-branch.sh
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
 
       echo '--- :ruby: Setup Ruby Tools'
       install_gems

.buildkite/finalize-release.yml

@@ -8,14 +8,11 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Release Branch'
-      .buildkite/commands/checkout-release-branch.sh
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
 
       echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
-      cp gradle.properties-example gradle.properties
-
       echo '--- :shipit: Finalize Release'
       bundle exec fastlane finalize_release skip_confirm:true
     agents:

.buildkite/new-beta-release.yml

@@ -11,8 +11,6 @@ steps:
       echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
-      cp gradle.properties-example gradle.properties
-
       echo '--- :shipit: New Beta Release'
       bundle exec fastlane new_beta_release skip_confirm:true
     agents:

.buildkite/pipeline.yml

@@ -39,15 +39,13 @@ steps:
 
       - label: "🕵️ checkstyle"
         command: |
-          cp gradle.properties-example gradle.properties
           ./gradlew checkstyle
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/checkstyle/checkstyle.*"
 
       - label: "🕵️ detekt"
         command: |
-          cp gradle.properties-example gradle.properties
           ./gradlew detekt
         plugins: [$CI_TOOLKIT]
         artifact_paths:
@@ -67,7 +65,6 @@ steps:
 
   - label: "Dependency Tree Diff"
     command: |
-      cp gradle.properties-example gradle.properties
       comment_with_dependency_diff 'WordPress' 'wordpressVanillaReleaseRuntimeClasspath'
     if: build.pull_request.id != null
     plugins: [$CI_TOOLKIT]

.buildkite/publish-release.yml

@@ -8,8 +8,7 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Release Branch'
-      .buildkite/commands/checkout-release-branch.sh
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
 
       echo '--- :ruby: Setup Ruby tools'
       install_gems