Merge pull request #16735 from staszekscp/internal-build-pr-badge

Add PR number badge for internal builds
Expensify · Apr 20, 2023 · 1cd304c · 1cd304c
2 parents 3dbfc33 + 5f6ac8a
commit 1cd304c
Show file tree

Hide file tree

Showing 22 changed files with 148 additions and 22 deletions.
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -71,6 +71,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -121,6 +127,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -178,6 +190,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
           fetch-depth: 0
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
@@ -192,7 +210,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build desktop app for testing
-        run: npm run desktop-build-internal -- --publish always
+        run: npm run desktop-build-adhoc -- --publish always
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -214,6 +232,12 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Configure AWS Credentials
@@ -223,7 +247,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build web for testing
-        run: npm run build-staging
+        run: npm run build-adhoc
 
       - name: Build docs
         run: npm run storybook-build

diff --git a/assets/images/new-expensify-adhoc.svg b/assets/images/new-expensify-adhoc.svg
diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
@@ -6,24 +6,24 @@ const pullRequestNumber = process.env.PULL_REQUEST_NUMBER;
 const s3Bucket = {
     production: 'expensify-cash',
     staging: 'staging-expensify-cash',
-    internal: 'ad-hoc-expensify-cash',
+    adhoc: 'ad-hoc-expensify-cash',
 };
 
 const s3Path = {
     production: '/',
     staging: '/',
-    internal: process.env.PULL_REQUEST_NUMBER
+    adhoc: process.env.PULL_REQUEST_NUMBER
         ? `/desktop/${pullRequestNumber}/`
         : '/',
 };
 
 const macIcon = {
     production: './desktop/icon.png',
     staging: './desktop/icon-stg.png',
-    internal: './desktop/icon-stg.png',
+    adhoc: './desktop/icon-adhoc.png',
 };
 
-const isCorrectElectronEnv = ['production', 'staging', 'internal'].includes(
+const isCorrectElectronEnv = ['production', 'staging', 'adhoc'].includes(
     process.env.ELECTRON_ENV,
 );
 

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -29,6 +29,7 @@ const envToLogoSuffixMap = {
     production: '',
     staging: '-stg',
     dev: '-dev',
+    adhoc: '-adhoc',
 };
 
 function mapEnvToLogoSuffix(envFile) {
@@ -120,7 +121,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
             // React Native JavaScript environment requires the global __DEV__ variable to be accessible.
             // react-native-render-html uses variable to log exclusively during development.
             // See https://reactnative.dev/docs/javascript-environment
-            __DEV__: /staging|prod/.test(envFile) === false,
+            __DEV__: /staging|prod|adhoc/.test(envFile) === false,
         }),
 
         // This allows us to interactively inspect JS bundle contents

diff --git a/desktop/icon-adhoc.png b/desktop/icon-adhoc.png
diff --git a/desktop/main.js b/desktop/main.js
@@ -241,7 +241,7 @@ const mainWindow = (() => {
     if (__DEV__) {
         console.debug('CONFIG: ', CONFIG);
         app.dock.setIcon(`${__dirname}/../icon-dev.png`);
-        app.setName('New Expensify');
+        app.setName('New Expensify Dev');
     }
 
     app.on('will-finish-launching', () => {

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -39,7 +39,7 @@ platform :android do
 
   desc "Build app for testing"
   lane :build_internal do
-    ENV["ENVFILE"]=".env.staging"
+    ENV["ENVFILE"]=".env.adhoc"
 
     gradle(
         project_dir: './android',
@@ -118,7 +118,7 @@ platform :ios do
   desc "Build app for testing"
   lane :build_internal do
     require 'securerandom'
-    ENV["ENVFILE"]=".env.staging"
+    ENV["ENVFILE"]=".env.adhoc"
 
     keychain_password = SecureRandom.uuid
 

diff --git a/package.json b/package.json
@@ -19,10 +19,11 @@
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.js",
     "build": "webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
     "build-staging": "webpack --config config/webpack/webpack.common.js --env envFile=.env.staging",
+    "build-adhoc": "webpack --config config/webpack/webpack.common.js --env envFile=.env.adhoc",
     "desktop": "scripts/set-pusher-suffix.sh && node desktop/start.js",
     "desktop-build": "scripts/build-desktop.sh production",
     "desktop-build-staging": "scripts/build-desktop.sh staging",
-    "desktop-build-internal": "scripts/build-desktop.sh internal",
+    "desktop-build-adhoc": "scripts/build-desktop.sh adhoc",
     "ios-build": "fastlane ios build",
     "android-build": "fastlane android build",
     "android-build-e2e": "bundle exec fastlane android build_e2e",

diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
@@ -5,8 +5,8 @@ export ELECTRON_ENV=${1:-development}
 
 if [[ "$ELECTRON_ENV" == "staging" ]]; then
   ENV_FILE=".env.staging"
-elif [[ "$ELECTRON_ENV" == "internal" ]]; then
-  ENV_FILE=".env.staging"
+elif [[ "$ELECTRON_ENV" == "adhoc" ]]; then
+  ENV_FILE=".env.adhoc"
 elif [[ "$ELECTRON_ENV" == "production" ]]; then
   ENV_FILE=".env.production"
 else

diff --git a/src/CONST.js b/src/CONST.js
@@ -10,6 +10,7 @@ const PLATFORM_OS_MACOS = 'Mac OS';
 const ANDROID_PACKAGE_NAME = 'com.expensify.chat';
 const USA_COUNTRY_NAME = 'United States';
 const CURRENT_YEAR = new Date().getFullYear();
+const PULL_REQUEST_NUMBER = lodashGet(Config, 'PULL_REQUEST_NUMBER', '');
 
 const CONST = {
     ANDROID_PACKAGE_NAME,
@@ -55,6 +56,8 @@ const CONST = {
         RESERVED_FIRST_NAMES: ['Expensify', 'Concierge'],
     },
 
+    PULL_REQUEST_NUMBER,
+
     CALENDAR_PICKER: {
         // Numbers were arbitrarily picked.
         MIN_YEAR: CURRENT_YEAR - 100,
@@ -694,6 +697,7 @@ const CONST = {
         DEV: 'development',
         STAGING: 'staging',
         PRODUCTION: 'production',
+        ADHOC: 'adhoc',
     },
 
     // Used to delay the initial fetching of reportActions when the app first inits or reconnects (e.g. returning

diff --git a/src/components/Badge.js b/src/components/Badge.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
 import Text from './Text';
+import CONST from '../CONST';
 
 const propTypes = {
     /** Is Success type */
@@ -18,6 +19,9 @@ const propTypes = {
     /** Text to display in the Badge */
     text: PropTypes.string.isRequired,
 
+    /** Text to display in the Badge */
+    environment: PropTypes.string,
+
     /** Styles for Badge */
     // eslint-disable-next-line react/forbid-prop-types
     badgeStyles: PropTypes.arrayOf(PropTypes.object),
@@ -32,6 +36,7 @@ const defaultProps = {
     pressable: false,
     badgeStyles: [],
     onPress: undefined,
+    environment: CONST.ENVIRONMENT.DEV,
 };
 
 const Badge = (props) => {
@@ -40,7 +45,7 @@ const Badge = (props) => {
     const wrapperStyles = ({pressed}) => ([
         styles.badge,
         styles.ml2,
-        StyleUtils.getBadgeColorStyle(props.success, props.error, pressed),
+        StyleUtils.getBadgeColorStyle(props.success, props.error, pressed, props.environment === CONST.ENVIRONMENT.ADHOC),
         ...props.badgeStyles,
     ]);
 

diff --git a/src/components/EnvironmentBadge.js b/src/components/EnvironmentBadge.js
@@ -3,11 +3,14 @@ import CONST from '../CONST';
 import withEnvironment, {environmentPropTypes} from './withEnvironment';
 import Badge from './Badge';
 import styles from '../styles/styles';
+import * as Environment from '../libs/Environment/Environment';
+import pkg from '../../package.json';
 
 const ENVIRONMENT_SHORT_FORM = {
     [CONST.ENVIRONMENT.DEV]: 'DEV',
     [CONST.ENVIRONMENT.STAGING]: 'STG',
     [CONST.ENVIRONMENT.PRODUCTION]: 'PROD',
+    [CONST.ENVIRONMENT.ADHOC]: 'ADHOC',
 };
 
 const EnvironmentBadge = (props) => {
@@ -16,12 +19,15 @@ const EnvironmentBadge = (props) => {
         return null;
     }
 
+    const text = Environment.isInternalTestBuild() ? `v${pkg.version} PR:${CONST.PULL_REQUEST_NUMBER}` : ENVIRONMENT_SHORT_FORM[props.environment];
+
     return (
         <Badge
-            success={props.environment === CONST.ENVIRONMENT.STAGING}
-            error={props.environment !== CONST.ENVIRONMENT.STAGING}
-            text={ENVIRONMENT_SHORT_FORM[props.environment]}
+            success={props.environment === CONST.ENVIRONMENT.STAGING || props.environment === CONST.ENVIRONMENT.ADHOC}
+            error={props.environment !== CONST.ENVIRONMENT.STAGING && props.environment !== CONST.ENVIRONMENT.ADHOC}
+            text={text}
             badgeStyles={[styles.alignSelfCenter]}
+            environment={props.environment}
         />
     );
 };

diff --git a/src/components/ExpensifyCashLogo.js b/src/components/ExpensifyCashLogo.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ProductionLogo from '../../assets/images/new-expensify.svg';
 import DevLogo from '../../assets/images/new-expensify-dev.svg';
 import StagingLogo from '../../assets/images/new-expensify-stg.svg';
+import AdhocLogo from '../../assets/images/new-expensify-adhoc.svg';
 import CONST from '../CONST';
 import withEnvironment, {environmentPropTypes} from './withEnvironment';
 
@@ -20,6 +21,7 @@ const logoComponents = {
     [CONST.ENVIRONMENT.DEV]: DevLogo,
     [CONST.ENVIRONMENT.STAGING]: StagingLogo,
     [CONST.ENVIRONMENT.PRODUCTION]: ProductionLogo,
+    [CONST.ENVIRONMENT.ADHOC]: AdhocLogo,
 };
 
 const ExpensifyCashLogo = (props) => {

diff --git a/src/libs/ApiUtils.js b/src/libs/ApiUtils.js
@@ -24,7 +24,7 @@ Environment.getEnvironment()
                     return;
                 }
 
-                const defaultToggleState = ENV_NAME === CONST.ENVIRONMENT.STAGING;
+                const defaultToggleState = ENV_NAME === CONST.ENVIRONMENT.STAGING || ENV_NAME === CONST.ENVIRONMENT.ADHOC;
                 shouldUseStagingServer = lodashGet(val, 'shouldUseStagingServer', defaultToggleState);
             },
         });

diff --git a/src/libs/Environment/Environment.js b/src/libs/Environment/Environment.js
@@ -8,12 +8,14 @@ const ENVIRONMENT_URLS = {
     [CONST.ENVIRONMENT.DEV]: CONST.DEV_NEW_EXPENSIFY_URL + CONFIG.DEV_PORT,
     [CONST.ENVIRONMENT.STAGING]: CONST.STAGING_NEW_EXPENSIFY_URL,
     [CONST.ENVIRONMENT.PRODUCTION]: CONST.NEW_EXPENSIFY_URL,
+    [CONST.ENVIRONMENT.ADHOC]: CONST.STAGING_NEW_EXPENSIFY_URL,
 };
 
 const OLDDOT_ENVIRONMENT_URLS = {
     [CONST.ENVIRONMENT.DEV]: CONST.INTERNAL_DEV_EXPENSIFY_URL,
     [CONST.ENVIRONMENT.STAGING]: CONST.STAGING_EXPENSIFY_URL,
     [CONST.ENVIRONMENT.PRODUCTION]: CONST.EXPENSIFY_URL,
+    [CONST.ENVIRONMENT.ADHOC]: CONST.STAGING_EXPENSIFY_URL,
 };
 
 /**
@@ -25,6 +27,15 @@ function isDevelopment() {
     return lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.DEV;
 }
 
+/**
+ * Are we running an internal test build?
+ *
+ * @return {boolean}
+ */
+function isInternalTestBuild() {
+    return lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.ADHOC && lodashGet(Config, 'PULL_REQUEST_NUMBER', '');
+}
+
 /**
  * Get the URL based on the environment we are in
  *
@@ -49,6 +60,7 @@ function getOldDotEnvironmentURL() {
 
 export {
     getEnvironment,
+    isInternalTestBuild,
     isDevelopment,
     getEnvironmentURL,
     getOldDotEnvironmentURL,

diff --git a/src/libs/Environment/getEnvironment/index.native.js b/src/libs/Environment/getEnvironment/index.native.js
@@ -22,7 +22,12 @@ function getEnvironment() {
             return resolve(environment);
         }
 
-        // If we haven't set the environment yet and we aren't on dev, check to see if this is a beta build
+        if (lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.ADHOC) {
+            environment = CONST.ENVIRONMENT.ADHOC;
+            return resolve(environment);
+        }
+
+        // If we haven't set the environment yet and we aren't on dev/adhoc, check to see if this is a beta build
         betaChecker.isBetaBuild()
             .then((isBeta) => {
                 environment = isBeta ? CONST.ENVIRONMENT.STAGING : CONST.ENVIRONMENT.PRODUCTION;