.circleci/cache-version

@@ -1,2 +1,2 @@
 # To invalidate the cache, generate a new UUID using `uuidgen` on the command line then paste it here
-8412DC8E-32C7-48D9-9C6B-E84319AE0436
+BA7CD240-05A5-4C42-AFD5-4C66D94F520C

.circleci/config.yml

@@ -13,6 +13,12 @@ parameters:
   translation_review_lang_id:
     type: string
     default: all-lang
+  beta_build:
+    type: boolean
+    default: false
+  release_build:
+    type: boolean
+    default: false
 
 xcode_version: &xcode_version
   xcode-version: "12.1.0"
@@ -42,6 +48,9 @@ commands:
             chruby ruby-2.6.6
             gem install bundler
 
+            # Prevent fastlane from checking for updates, also removing the verbose fastlane changelog at the end of each invocation.
+            echo "export FASTLANE_SKIP_UPDATE_CHECK=1" >> $BASH_ENV
+
 jobs:
   Build Tests:
     parameters:
@@ -185,23 +194,37 @@ jobs:
             bundle-install: true
             pod-install: true
             cache-prefix: cache-prefix-{{ checksum ".circleci/cache-version" }}
-      - run: 
+      - run:
           name: Copy Secrets
           command: bundle exec fastlane run configure_apply
-      - run: 
+      - run:
           name: Install other tools
           command: |
             brew install imagemagick
             brew install ghostscript
             curl -sL https://sentry.io/get-cli/ | bash
       - run:
-          name: Build
+          name: Setup notifications
           command: |
             APP_VERSION=$(cat config/Version.Public.xcconfig | grep "^VERSION_LONG" | cut -d "=" -f2)
             echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for WordPress iOS $APP_VERSION failed!'" >> $BASH_ENV
-            echo "export SLACK_SUCCESS_MESSAGE=':tada: WordPress iOS $APP_VERSION has been deployed!'" >> $BASH_ENV 
-            bundle exec fastlane build_and_upload_release skip_confirm:true
-          no_output_timeout: 60m
+            echo "export SLACK_SUCCESS_MESSAGE=':tada: WordPress iOS $APP_VERSION has been deployed!'" >> $BASH_ENV
+      - when:
+          condition: << pipeline.parameters.beta_build >>
+          steps:
+            - run:
+                name: Build
+                command: |
+                  bundle exec fastlane build_and_upload_beta_release skip_confirm:true create_gh_release:true
+                no_output_timeout: 60m
+      - when:
+          condition: << pipeline.parameters.release_build >>
+          steps:
+            - run:
+                name: Build
+                command: |
+                  bundle exec fastlane build_and_upload_stable_release skip_confirm:true create_gh_release:true
+                no_output_timeout: 60m
       - slack/status:
           include_job_number_field: false
           include_project_field: false
@@ -210,7 +233,7 @@ jobs:
           failure_message: '${SLACK_FAILURE_MESSAGE}'
           success_message: '${SLACK_SUCCESS_MESSAGE}'
   translation-review-build:
-    executor: 
+    executor:
       name: ios/default
       <<: *xcode_version
     environment:
@@ -222,18 +245,18 @@ jobs:
             bundle-install: true
             pod-install: true
             cache-prefix: cache-prefix-{{ checksum ".circleci/cache-version" }}
-      - run: 
+      - run:
           name: Copy Secrets
           command: bundle exec fastlane run configure_apply
-      - run: 
+      - run:
           name: Install other tools
           command: |
             brew install imagemagick
             brew install ghostscript
             curl -sL https://sentry.io/get-cli/ | bash
       - run:
           name: Build
-          command: | 
+          command: |
             orig_version=`cat config/Version.internal.xcconfig | grep VERSION_SHORT | cut -d'=' -f2`
             sed -i '' "$(awk '/^VERSION_SHORT/{ print NR; exit }' "config/Version.internal.xcconfig")s/=.*/="${orig_version}"-`date +"%Y%d%m"`-"${CIRCLE_BUILD_NUM}"/" "config/Version.internal.xcconfig"
 
@@ -248,7 +271,11 @@ jobs:
 
 workflows:
   wordpress_ios:
-    unless: << pipeline.parameters.translation_review_build >>
+    when:
+      and:
+        - not: << pipeline.parameters.translation_review_build >>
+        - not: << pipeline.parameters.beta_build >>
+        - not: << pipeline.parameters.release_build >>
     jobs:
       - Build Tests:
           <<: *iphone_test_device
@@ -294,27 +321,27 @@ workflows:
           <<: *ipad_test_device
           requires: [ "Optional Tests" ]
   Installable Build:
-    unless: << pipeline.parameters.translation_review_build >>
+    when:
+      and:
+        - not: << pipeline.parameters.translation_review_build >>
+        - not: << pipeline.parameters.beta_build >>
+        - not: << pipeline.parameters.release_build >>
     jobs:
       - Hold:
           type: approval
           filters:
             branches:
               ignore: /pull\/[0-9]+/
       - Installable Build:
-          requires: [Hold]  
+          requires: [Hold]
           filters:
             branches:
               ignore: /pull\/[0-9]+/
   Release Build:
-    unless: << pipeline.parameters.translation_review_build >>
+    when:
+      or: [ << pipeline.parameters.beta_build >>, << pipeline.parameters.release_build >> ]
     jobs:
-      - Release Build: 
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^\d.\d?(.\d)?(.\d)?(.\d{1,4})$/
+      - Release Build
   Translation Review Build:
     when: << pipeline.parameters.translation_review_build >>
     jobs:

.editorconfig

@@ -0,0 +1,10 @@
+# Apply to all files
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Ruby specific rules
+[{*.rb,Fastfile,Gemfile}]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1,3 +1,4 @@
 RELEASE-NOTES.txt merge=union
 *.strings diff=localizablestrings
 
+.configure-files/*.enc binary

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,8 +2,18 @@ Fixes #
 
 To test:
 
+## Regression Notes
+1. Potential unintended areas of impact
+
+
+2. What I did to test those areas of impact (or what existing automated tests I relied on)
+
+
+3. What automated tests I added (or what prevented me from doing so)
+
 PR submission checklist:
 
-- [ ] I have considered adding unit tests where possible.
+- [ ] I have completed the Regression Notes.
+- [ ] I have considered adding unit tests for my changes.
 - [ ] I have considered adding accessibility improvements for my changes.
 - [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.

Gemfile

@@ -4,7 +4,7 @@ gem 'rake'
 gem 'cocoapods', '~> 1.10'
 gem 'xcpretty-travis-formatter'
 gem 'octokit', "~> 4.0"
-gem 'fastlane', "~> 2.162"
+gem 'fastlane', "~> 2.174"
 gem 'dotenv'
 gem 'commonmarker'