Skip to content

Commit

Permalink
Merge branch 'master' into fortuna-newvpn
Browse files Browse the repository at this point in the history
  • Loading branch information
fortuna committed Jul 18, 2023
2 parents 68d357c + 8c13f4d commit 69e0499
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ npm run action src/www/storybook
>
> to your shell, then try `outline www/start`!
## Passing configuration flags to actions
Certain actions take configuration flags - but since we're running them through `npm`, you'll have to use the `--` seperator to funnel them through to the underlying process. For example, to set up a MacOS project in release mode, you'd run:
```sh
SENTRY_DSN=<your sentry dsn> npm run action cordova/setup macos -- --buildMode=release --versionName=<your version name>
```
## Life of a Packet
[How does the Outline Client work?](docs/life_of_a_packet.md)
Expand Down
5 changes: 5 additions & 0 deletions src/cordova/setup.action.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {getRootDir} from '../build/get_root_dir.mjs';
import {runAction} from '../build/run_action.mjs';
import {getBuildParameters} from '../build/get_build_parameters.mjs';
import {spawnStream} from '../build/spawn_stream.mjs';
import chalk from 'chalk';

const WORKING_CORDOVA_OSX_COMMIT = '07e62a53aa6a8a828fd988bc9e884c38c3495a67';

Expand Down Expand Up @@ -140,6 +141,10 @@ async function appleMacOsDebug(verbose) {
throw new Error('Building an Apple binary requires xcodebuild and can only be done on MacOS');
}

console.warn(
chalk.yellow('Debug mode on the MacOS client is currently broken. Try running with `--buildMode=release` instead.')
);

await cordova.platform('add', [`github:apache/cordova-osx#${WORKING_CORDOVA_OSX_COMMIT}`], {save: false});

await cordova.prepare({
Expand Down

0 comments on commit 69e0499

Please sign in to comment.