Merge pull request #3323 from StoDevX/circle-handle-tags-properly

Circle: Handle tags more properly

Author: rye

.circleci/config.yml

@@ -264,10 +264,15 @@ jobs:
       - run:
           name: "Reconcile Git histories"
           command: |
-            git checkout master
-            git reset --hard origin/master
-            git checkout "$CIRCLE_BRANCH"
-            git reset --hard "origin/$CIRCLE_BRANCH"
+            if [ -z "$CIRCLE_TAG" ];
+            then
+              git checkout master
+              git reset --hard origin/master
+              git checkout "$CIRCLE_BRANCH"
+              git reset --hard "origin/$CIRCLE_BRANCH"
+            else
+              echo "CIRCLE_TAG was set, didn't do anything"
+            fi
       - run: mkdir -p logs/
       - run: touch logs/build-status
       - run:
@@ -335,10 +340,15 @@ jobs:
       - run:
           name: "Reconcile Git histories"
           command: |
-            git checkout master
-            git reset --hard origin/master
-            git checkout "$CIRCLE_BRANCH"
-            git reset --hard "origin/$CIRCLE_BRANCH"
+            if [ -z "$CIRCLE_TAG" ];
+            then
+              git checkout master
+              git reset --hard origin/master
+              git checkout "$CIRCLE_BRANCH"
+              git reset --hard "origin/$CIRCLE_BRANCH"
+            else
+              echo "CIRCLE_TAG was set, didn't do anything"
+            fi
       - run: mkdir -p logs/
       - run: touch logs/build-status
       - run:

CHANGELOG.md

@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fixed the touchable ref from not passing from the filter toolbar button to the popover (#3279)
 - Resolved some circular `require` statements in our code (#3280)
 - Resolved issue with OleCard login just never working (#3308)
+- Made build tooling always build tagged commits (#3323)
 
 ## [2.6.3] - 2018-09-17
 ### Fixed

scripts/should-skip-build

@@ -139,8 +139,15 @@ def should_build_nightly?
   anything_changed_yesterday?
 end
 
+def tagged_build?
+  travis = ENV['TRAVIS_TAG'] && !ENV['TRAVIS_TAG'].empty?
+  circle = ENV['CIRCLE_TAG'] && !ENV['CIRCLE_TAG'].empty?
+  travis || circle
+end
+
 # checks if the native build needs to be run
 def should_build?
+  return true if tagged_build?
   return should_build_nightly? if ENV['IS_NIGHTLY']
 
   # Find the oldest common revision between HEAD's parent and our