Only do eigen, not eigen staging to sentry

artsy · May 25, 2018 · 675610e · 675610e
1 parent c2f49cc
commit 675610e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/Artsy/View_Controllers/ARVIR/VCs/ARAugmentedVIRSetupViewController.m b/Artsy/View_Controllers/ARVIR/VCs/ARAugmentedVIRSetupViewController.m
@@ -166,7 +166,7 @@ - (void)viewDidLoad
         title.font = [UIFont serifSemiBoldFontWithSize:26];
         title.backgroundColor = [UIColor clearColor];
         title.textColor = [UIColor whiteColor];
-        title.text = [arTitle uppercaseString];
+        title.text = arTitle;
         title.numberOfLines = 1;
         [overlay addSubview:title];
 
@@ -237,7 +237,7 @@ - (void)next
         if (allowedAccess) {
             [self.defaults setBool:YES forKey:ARAugmentedRealityHasTriedToSetup];
 
-            Class Controller = [AROptions boolForOption:AROptionsFloorBasedARVIR] ? ARAugmentedVIRViewController.class : ARAugmentedFloorBasedVIRViewController.class;
+            Class Controller = [AROptions boolForOption:AROptionsFloorBasedARVIR] ? ARAugmentedFloorBasedVIRViewController.class : ARAugmentedVIRViewController.class;
             id vc = [[Controller alloc] initWithConfig:self.config];
             [self.navigationController pushViewController:vc animated:YES];
         } else {

diff --git a/CHANGELOG.yml b/CHANGELOG.yml
@@ -5,6 +5,7 @@ upcoming:
   user_facing:
     - Add push notification support for /auctions - maxim
     - Adds a new ARVIR behind a feature flag - orta
+    - Update sthe type on the setup page for AR - orta
   admin:
     - Adds an admin button to trigger getting notifications - orta
 

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -67,8 +67,6 @@ lane :ship_beta do
   dsyms_path = File.join(root, 'dSYMs')
   sh "unzip -d #{dsyms_path} #{dsym_archive}"
 
-
-
   upload_to_sentry = lambda do |project_slug|
     org_slug = 'artsynet'
     sentry_create_release auth_token: ENV['SentryUploadAuthKey'],
@@ -87,36 +85,37 @@ lane :ship_beta do
                          puts "Uploaded dsym for #{project_slug}"
     end
 
-    sentry_upload_file auth_token: ENV['SentryUploadAuthKey'],
-                       org_slug: org_slug,
-                       project_slug: project_slug,
-                       version: sentry_version,
-                       dist: sentry_dist,
-                       file: 'Pods/Emission/Pod/Assets/Emission.js'
-    puts "Uploaded Emission.js for #{project_slug}"
-
-    sentry_upload_sourcemap auth_token: ENV['SentryUploadAuthKey'],
-                            org_slug: org_slug,
-                            project_slug: project_slug,
-                            version: sentry_version,
-                            dist: sentry_dist,
-                            sourcemap: 'Pods/Emission/Pod/Assets/Emission.js.map',
-                            rewrite: true
-    puts "Uploaded Emission.js.map for #{project_slug}"
+    begin
+      sentry_upload_file auth_token: ENV['SentryUploadAuthKey'],
+      org_slug: org_slug,
+      project_slug: project_slug,
+      version: sentry_version,
+      dist: sentry_dist,
+      file: 'Pods/Emission/Pod/Assets/Emission.js'
+      puts "Uploaded Emission.js for #{project_slug}"
+
+      sentry_upload_sourcemap auth_token: ENV['SentryUploadAuthKey'],
+      org_slug: org_slug,
+      project_slug: project_slug,
+      version: sentry_version,
+      dist: sentry_dist,
+      sourcemap: 'Pods/Emission/Pod/Assets/Emission.js.map',
+      rewrite: true
+      puts "Uploaded Emission.js.map for #{project_slug}"
+
+    rescue => exception
+      puts "Uploading the JS to sentry failed, this usually only happens when you are shipping many builds to sentry"
+      puts exception.message
+      puts exception.backtrace.join("\n\t")
+    end
   end
 
   upload_to_sentry.call('eigen')
-  upload_to_sentry.call('eigen-staging')
-
-  # uboMake dSYM archive available in case we failed to put them in the right place in Sentry.
-  FileUtils.mv(dsym_archive, ENV['CIRCLE_ARTIFACTS'])
+  # We get "file already present" when trying to upload this for staging
+  # https://circleci.com/gh/artsy/eigen/5274
+  #
+  # upload_to_sentry.call('eigen-staging')
 
-  # # Send to the app store
-  # pilot changelog: beta_readme, itc_provider: 'ArtsyInc'
-end
-
-error do |_, exception|
-  File.open(File.join('.', 'fastlane-error.txt'), 'w') do |file|
-    file.puts("#{exception.message}\n\t#{exception.backtrace.join("\n\t")}")
-  end
+  # Send to the app store
+  pilot changelog: beta_readme, itc_provider: 'ArtsyInc'
 end