This repository has been archived by the owner on May 10, 2024. It is now read-only.

No Bug: Add support for building with enterprise account #2732

Merged

kylehickinson merged 8 commits into development from enterprise-build

Jul 23, 2020

Collaborator

kylehickinson commented Jul 22, 2020

Summary of Changes

Environment variables must be placed in .env.default in root directory. PR can be squashed

Submitter Checklist:

Unit Tests are updated to cover new or changed functionality
User-facing strings use NSLocalizableString()

Reviewer Checklist:

Issues include necessary QA labels:
- QA/(Yes|No)
- release-notes/(include|exclude)
- bug / enhancement
Necessary security reviews have taken place.
Adequate unit test coverage exists to prevent regressions.
Adequate test plan exists for QA to validate (if applicable).
Issue is assigned to a milestone (should happen at merge time).

kylehickinson added 6 commits

July 22, 2020 11:31


          WIP: Enterprise build

af7dc5f


          Get API key from environment & remove redundant appcenter arguments

a427784

Updates appcenter plugin


          Use git branch as version and SHA as build ID for enterprise builds

796d167


          Don't send DAU pings on enterprise builds

14f1fc1


          Setup new build channel for enterprise builds instead of using Brave Dev

addfde8

Renames build channels:
- `developer` -> `debug`
- `enterprise` -> `dev`

Then creates `enterprise` again for enterprise builds

Renames preprocessor macros:
- `MOZ_CHANNEL_FENNEC` -> `MOZ_CHANNEL_DEBUG`
- `MOZ_CHANNEL_ENTERPRISE` -> `MOZ_CHANNEL_DEV`

Then creates `MOZ_CHANNEL_ENTERPRISE` again for enterprise builds


          Cleanup schemes, entitlements and project settings

kylehickinson requested review from jumde and iccub

July 22, 2020 15:33


          Fix DAU tests

8a6d25a

iccub suggested changes

View reviewed changes

Contributor

iccub left a comment

Looks good left few questions

Client.xcodeproj/xcshareddata/xcschemes/BraveShareTo.xcscheme Show resolved Hide resolved

fastlane/Fastfile

    
            @@ -104,7 +134,7 @@ platform :ios do
          
                    sdk: "iphoneos",

                    clean: true,

                    skip_package_ipa: true,

                    xcargs: "-allowProvisioningUpdates BRAVE_API_KEY=\"#{sh("head", "-1", "#{ENV['HOME']}/.brave-api-key")}\""

                    xcargs: "-allowProvisioningUpdates BRAVE_API_KEY=\"#{ENV['BRAVE_STATS_API_KEY']}\""

Contributor

iccub Jul 22, 2020

Doesn't this affect our manual builds now? Since we have to read the api key from disk

Collaborator Author

kylehickinson Jul 22, 2020

Yes, API key will now go in .env.default file in brave-ios which won't be committed. That file matches

KEY = VALUE
KEY2 = VALUE2

syntax.

Contributor

iccub Jul 22, 2020

perfect

Client.xcodeproj/project.pbxproj

@@ @@ -5569,13 +5573,16 @@ @@
 DEC18234CC75F009DAC37 = {
               						CreatedOnToolsVersion = 11.1;
               						LastSwiftMigration = 1110;
+              						ProvisioningStyle = Automatic;

Contributor

iccub Jul 22, 2020

what's this? added to many places, looks like CODE_SIGN_STYLE replacement

Collaborator Author

kylehickinson Jul 22, 2020

Im not sure I can control this one since its not part of the build settings. I believe Xcode added this once code sign style differed between different build configs

Client.xcodeproj/project.pbxproj Show resolved Hide resolved

Client.xcodeproj/project.pbxproj Outdated

-              				CODE_SIGN_STYLE = Automatic;
-              				COPY_PHASE_STRIP = NO;
+              				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+              				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Dev;

Contributor

iccub Jul 22, 2020

We should ask James for new icon for enterprise builds

Collaborator Author

kylehickinson Jul 22, 2020

cc @jamesmudgett If you want to give us a new icon for Enterprise builds? Otherwise it will use Brave Dev icons

Collaborator

Brandon-T Jul 22, 2020

Can also use:

add_badge(
      no_badge: true, 
      shield: "#{ENV["CONFIGURATION"]}-#{ENV["VERSION_NAME"]}[#{ENV["BUILD_NUMBER"]}]-blue", 
      shield_no_resize: true
    )

And it'll automatically add like a blue stripe with version and build type to the icon.

kylehickinson mentioned this pull request

added appcenter to fastlane #2720

Closed

7 tasks

Brandon-T suggested changes

View reviewed changes

Client.xcodeproj/project.pbxproj Show resolved Hide resolved

Client.xcodeproj/project.pbxproj Show resolved Hide resolved

Client.xcodeproj/project.pbxproj Show resolved Hide resolved

Client.xcodeproj/project.pbxproj Outdated

-              				CODE_SIGN_STYLE = Automatic;
-              				COPY_PHASE_STRIP = NO;
+              				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+              				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Dev;

Collaborator

Brandon-T Jul 22, 2020

Can also use:

add_badge(
      no_badge: true, 
      shield: "#{ENV["CONFIGURATION"]}-#{ENV["VERSION_NAME"]}[#{ENV["BUILD_NUMBER"]}]-blue", 
      shield_no_resize: true
    )

And it'll automatically add like a blue stripe with version and build type to the icon.

Contributor

iccub commented Jul 22, 2020

@Brandon-T we don't use badges. We harcode them within the app_icon

iccub approved these changes

View reviewed changes


          Add enterprise icon

3e6f69c

Brandon-T approved these changes

View reviewed changes

kylehickinson merged commit eecd60e into development

kylehickinson deleted the enterprise-build branch

July 23, 2020 18:23

iccub mentioned this pull request

Automate Enterprise betas #108

Closed

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet