Skip to content

Commit

Permalink
Rename electronBuilder configs
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham committed Feb 11, 2022
1 parent ca73ad8 commit 3419249
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseElectronBuilderConfig = require('./electronBuilder.base.config');
const baseElectronBuilderConfig = require('./electronBuilder.local.config');

const isStagingBuild = process.env.NODE_ENV === 'staging';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion desktop/ELECTRON_ENVIRONMENT.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion desktop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion desktop/notarize.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 3419249

Please sign in to comment.