Add electron auto updating

.github/workflows/android.yml

@@ -2,7 +2,7 @@ name: Build and Deploy Android
 
 on:
     push:
-        branches: [ master ]
+        tags: ['**']
 
 jobs:
     build:

.github/workflows/desktop.yml

@@ -2,7 +2,7 @@ name: Build and Deploy Desktop
 
 on:
     push:
-        branches: [ master ]
+        tags: ['**']
 
 jobs:
     build:
@@ -18,13 +18,6 @@ jobs:
             - name: Install node packages
               run: npm install
 
-            - name: Configure AWS Credentials
-              uses: aws-actions/configure-aws-credentials@v1
-              with:
-                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-                  aws-region: us-east-1
-
             - name: Decrypt Developer ID Certificate
               run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg
               env:
@@ -37,9 +30,5 @@ jobs:
                 CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
                 APPLE_ID: ${{ secrets.APPLE_ID }}
                 APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-
-            - name: Zip desktop build
-              run: 7z a $GITHUB_WORKSPACE/dist/mac/Chat.app.zip $GITHUB_WORKSPACE/dist/mac/Chat.app
-
-            - name: Deploy to S3
-              run: aws s3 cp --acl public-read $GITHUB_WORKSPACE/dist/mac/Chat.app.zip s3://chat-test-expensify-com/Chat.app.zip
+                AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/lint.yml

@@ -1,6 +1,6 @@
 name: eslint
 
-on: [push]
+on: push
 
 jobs:
     build:

.github/workflows/version.yml

@@ -0,0 +1,29 @@
+name: Create a new version
+
+on:
+    push:
+        branches: [master]
+
+jobs:
+    build:
+        runs-on: ubuntu-16.04
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Setup Node
+              uses: actions/setup-node@v1
+              with:
+                  node-version: '14.x'
+
+            - name: Install dependenices
+              run: npm install
+
+            - name: Set git user
+              run: git config user.name github-action
+
+            - name: Generate version
+              run: npm version prerelease -m "Update version to %s"
+
+            - name: Push new version
+              run: git push && git push --tags

.github/workflows/web.yml

@@ -0,0 +1,51 @@
+name: Build and Deploy Web
+
+on:
+    push:
+        tags: ['**']
+
+jobs:
+    build:
+        runs-on: ubuntu-16.04
+
+        steps:
+        - uses: actions/checkout@v2
+
+        # Installs node
+        - name: Setup Node
+          uses: actions/setup-node@v1
+          with:
+            node-version: '14.x'
+
+        # Install python pre-reqs
+        - name: Setup python
+          run: sudo apt-get install python3-setuptools
+
+        # Installs Cloudflare CLI, after installing/upgrading dependencies
+        - name: Setup Cloudflare CLI
+          run: |
+               pip3 install --upgrade pip
+               pip3 install wheel # need wheel before cloudflare, this is the only way to ensure order.
+               pip3 install cloudflare
+
+        - name: Configure AWS Credentials
+          uses: aws-actions/configure-aws-credentials@v1
+          with:
+            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-region: us-east-1
+
+        # Install node modules
+        - name: Install dependenices
+          run: npm install
+
+        - name: Build web
+          run: npm run build
+
+        - name: Deploy to S3
+          run: aws s3 cp --recursive --acl public-read $GITHUB_WORKSPACE/dist s3://chat-test-expensify-com/
+
+        - name: Purge Cloudflare cache
+          run: /home/runner/.local/bin/cli4 --delete hosts=["chat.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+          env:
+            CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}

android/app/build.gradle

@@ -138,8 +138,8 @@ android {
         applicationId "com.expensifyreactnative.chat"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5
-        versionName "1.0.1-4"
+        versionCode 18
+        versionName "1.0.1-17"
     }
     splits {
         abi {

desktop/electron.config.js

@@ -10,6 +10,16 @@ module.exports = {
         entitlementsInherit: 'desktop/entitlements.mac.plist',
         type: 'distribution'
     },
+    dmg: {
+        title: 'Chat',
+        artifactName: 'Chat.dmg',
+        internetEnabled: true
+    },
+    publish: [{
+        provider: 's3',
+        bucket: 'chat-test-expensify-com',
+        channel: 'latest'
+    }],
     files: [
         './dist/**/*',
         './main.js'

ios/ReactNativeChat/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>18</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>

ios/ReactNativeChatTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>18</string>
 </dict>
 </plist>

main.js

@@ -1,49 +1,53 @@
 const {app, BrowserWindow, shell} = require('electron');
 const serve = require('electron-serve');
 const contextMenu = require('electron-context-menu');
+const {autoUpdater} = require('electron-updater');
 
 /**
  * Electron main process that handles wrapping the web application.
  *
  * @see: https://www.electronjs.org/docs/tutorial/application-architecture#main-and-renderer-processes
  */
 
-// TODO: Turn this off, use web-security after alpha launch, currently we recieve a CORS issue preventing
+// TODO: Turn this off, use web-security after alpha launch, currently we receive a CORS issue preventing
 // the electron app from making any API requests.
 app.commandLine.appendSwitch('disable-web-security');
 
-const mainWindow = (async () => {
+// Initialize the right click menu
+// See https://github.com/sindresorhus/electron-context-menu
+contextMenu();
+
+const mainWindow = (() => {
     const loadURL = serve({directory: 'dist'});
 
-    await app.whenReady();
-
-    // Initialize the right click menu
-    // See https://github.com/sindresorhus/electron-context-menu
-    contextMenu();
-
-    const browserWindow = new BrowserWindow({
-        backgroundColor: '#FAFAFA',
-        width: 1200,
-        height: 900,
-        webPreferences: {
-            nodeIntegration: true,
-        },
-    });
-
-    await loadURL(browserWindow);
-
-    // When the user clicks a link that has target="_blank" (which is all external links)
-    // open the default browser instead of a new electron window
-    browserWindow.webContents.on('new-window', (e, url) => {
-        // make sure local urls stay in electron perimeter
-        if (url.substr(0, 'file://'.length) === 'file://') {
-            return;
-        }
-
-        // and open every other protocol in the browser
-        e.preventDefault();
-        shell.openExternal(url);
-    });
+    return app.whenReady()
+        .then(() => {
+            const browserWindow = new BrowserWindow({
+                backgroundColor: '#FAFAFA',
+                width: 1200,
+                height: 900,
+                webPreferences: {
+                    nodeIntegration: true,
+                },
+            });
+
+            // When the user clicks a link that has target="_blank" (which is all external links)
+            // open the default browser instead of a new electron window
+            browserWindow.webContents.on('new-window', (e, url) => {
+                // make sure local urls stay in electron perimeter
+                if (url.substr(0, 'file://'.length) === 'file://') {
+                    return;
+                }
+
+                // and open every other protocol in the browser
+                e.preventDefault();
+                return shell.openExternal(url);
+            });
+
+            return browserWindow;
+        })
+        .then(browserWindow => loadURL(browserWindow))
+        .then(() => autoUpdater.checkForUpdatesAndNotify());
 });
 
-mainWindow();
+mainWindow().then(window => window);