diff --git a/config/electronBuilder/electronBuilder.config.js b/config/electronBuilder/electronBuilder.ghactions.config.js similarity index 80% rename from config/electronBuilder/electronBuilder.config.js rename to config/electronBuilder/electronBuilder.ghactions.config.js index c7f69557746b..f71628f4136f 100644 --- a/config/electronBuilder/electronBuilder.config.js +++ b/config/electronBuilder/electronBuilder.ghactions.config.js @@ -1,4 +1,4 @@ -const baseElectronBuilderConfig = require('./electronBuilder.base.config'); +const baseElectronBuilderConfig = require('./electronBuilder.local.config'); const isStagingBuild = process.env.NODE_ENV === 'staging'; diff --git a/config/electronBuilder/electronBuilder.base.config.js b/config/electronBuilder/electronBuilder.local.config.js similarity index 88% rename from config/electronBuilder/electronBuilder.base.config.js rename to config/electronBuilder/electronBuilder.local.config.js index 4dbbd4eba2b9..cb9ca5944d32 100644 --- a/config/electronBuilder/electronBuilder.base.config.js +++ b/config/electronBuilder/electronBuilder.local.config.js @@ -6,7 +6,7 @@ const isStagingBuild = process.env.NODE_ENV === 'staging'; * The basic app configurations for the production and staging Electron builds, * without the pieces that require code signing, notarizing, and publishing. * - * This has been separated from main electronBuilder.config.js file to make it easier to run local production or staging builds. + * This has been separated from main electronBuilder.ghactions.config.js file to make it easier to run local production or staging builds. */ module.exports = { appId: 'com.expensifyreactnative.chat', diff --git a/desktop/ELECTRON_ENVIRONMENT.js b/desktop/ELECTRON_ENVIRONMENT.js index fd86190610c3..eb947c0e5939 100644 --- a/desktop/ELECTRON_ENVIRONMENT.js +++ b/desktop/ELECTRON_ENVIRONMENT.js @@ -1,4 +1,4 @@ -// This variable is injected into package.json by electron-builder via the extraMetadata field (specified in electronBuilder.config.js) +// This variable is injected into package.json by electron-builder via the extraMetadata field (specified in electronBuilder.ghactions.config.js) // It will be `PROD` on production, `STG` on staging, and `undefined` on dev (because dev doesn't use electron-builder) const {electronEnvironment} = require('../package.json'); const ENVIRONMENT = require('../src/CONST/ENVIRONMENT'); diff --git a/desktop/README.md b/desktop/README.md index 953f2f5257b9..3980972d3d95 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -87,7 +87,7 @@ mc policy set public electron-builder/electron-builder Once you have Min.IO setup and running, the next step is to temporarily revert some changes from https://github.com/Expensify/App/commit/b640b3010fd7a40783d1c04faf4489836e98038d, specifically 1. Update the `desktop-build` command in package.json to add `--publish always` at the end -2. Update electronBuilder.config.js to replace the `publish` value with the following: +2. Update electronBuilder.ghactions.config.js to replace the `publish` value with the following: ``` publish: [{ provider: 's3', diff --git a/desktop/notarize.js b/desktop/notarize.js index 70ee4a893356..fd4be01f35dd 100644 --- a/desktop/notarize.js +++ b/desktop/notarize.js @@ -1,5 +1,5 @@ const {notarize} = require('electron-notarize'); -const electron = require('../config/electronBuilder/electronBuilder.config'); +const electron = require('../config/electronBuilder/electronBuilder.ghactions.config'); exports.default = function notarizing(context) { const {electronPlatformName, appOutDir} = context; diff --git a/package.json b/package.json index e1a0fb081867..f7d0b84463fd 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ "web": "node web/proxy.js & webpack-dev-server --open --config config/webpack/webpack.dev.js", "build": "webpack --config config/webpack/webpack.prod.js", "build-staging": "webpack --config config/webpack/webpack.staging.js", - "desktop-build": "export NODE_ENV=production && webpack --config config/webpack/webpack.prod.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.config.js", - "desktop-build-staging": "export NODE_ENV=staging && webpack --config config/webpack/webpack.staging.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.config.js", - "desktop-build-local": "export NODE_ENV=production && webpack --config config/webpack/webpack.prod.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.base.config.js", - "desktop-build-staging-local": "export NODE_ENV=staging && webpack --config config/webpack/webpack.staging.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.base.config.js", + "desktop-build": "export NODE_ENV=production && webpack --config config/webpack/webpack.prod.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.ghactions.config.js", + "desktop-build-staging": "export NODE_ENV=staging && webpack --config config/webpack/webpack.staging.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.ghactions.config.js", + "desktop-build-local": "export NODE_ENV=production && webpack --config config/webpack/webpack.prod.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.local.config.js", + "desktop-build-staging-local": "export NODE_ENV=staging && webpack --config config/webpack/webpack.staging.js --platform desktop && electron-builder --config config/electronBuilder/electronBuilder.local.config.js", "ios-build": "fastlane ios build", "android-build": "fastlane android build", "test": "jest",