mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
Tools: Removed no longer needed double-dash and fixed CI
This commit is contained in:
parent
106ce4b09d
commit
e08359f7e0
4
.github/scripts/run_ci.sh
vendored
4
.github/scripts/run_ci.sh
vendored
@ -171,8 +171,8 @@ if [[ $GIT_TAG_NAME = v* ]]; then
|
||||
elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
|
||||
echo "Step: Building Docker Image..."
|
||||
cd "$ROOT_DIR"
|
||||
yarn run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
|
||||
yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images
|
||||
else
|
||||
echo "Step: Building but *not* publishing desktop application..."
|
||||
USE_HARD_LINKS=false yarn run dist -- --publish=never
|
||||
USE_HARD_LINKS=false yarn run dist --publish=never
|
||||
fi
|
||||
|
2
BUILD.md
2
BUILD.md
@ -75,7 +75,7 @@ Running `yarn run tsc` would have the same effect, but without watching.
|
||||
|
||||
You can specify additional parameters when running the desktop or CLI application. To do so, add `--` to the `yarn start` command, followed by your flags. For example:
|
||||
|
||||
yarn start -- --debug
|
||||
yarn start --debug
|
||||
|
||||
## TypeScript
|
||||
|
||||
|
@ -74,13 +74,13 @@ yarn test
|
||||
To run just one particular file:
|
||||
|
||||
```sh
|
||||
yarn test -- --filter=markdownUtils # Don't add the .js extension
|
||||
yarn test --filter=markdownUtils # Don't add the .js extension
|
||||
```
|
||||
|
||||
To filter tests. For example, to run all the test units that contain "should handle conflict" in their description:
|
||||
|
||||
```sh
|
||||
yarn test -- --filter="should handle conflict"
|
||||
yarn test --filter="should handle conflict"
|
||||
```
|
||||
|
||||
## About abandoned pull requests
|
||||
|
@ -20,7 +20,7 @@ The desktop application is built for Windows, macOS and Linux via continuous int
|
||||
|
||||
The app is built and upload to GitHub using:
|
||||
|
||||
yarn run releaseAndroid -- --type=prerelease
|
||||
yarn run releaseAndroid --type=prerelease
|
||||
|
||||
The "type" parameter can be either "release" or "prerelease"
|
||||
|
||||
|
@ -48,5 +48,5 @@ while [ "$NUM" -lt 400 ]; do
|
||||
echo "config sync.10.password hunter1hunter2hunter3" >> "$CMD_FILE"
|
||||
echo "sync" >> "$CMD_FILE"
|
||||
|
||||
yarn start -- --profile "$PROFILE_DIR" batch "$CMD_FILE"
|
||||
yarn start --profile "$PROFILE_DIR" batch "$CMD_FILE"
|
||||
done
|
||||
|
@ -52,7 +52,7 @@ do
|
||||
done
|
||||
|
||||
cd "$ROOT_DIR/packages/app-cli"
|
||||
yarn start -- --profile "$PROFILE_DIR" batch "$CMD_FILE"
|
||||
yarn start -- --profile "$PROFILE_DIR" import ~/Desktop/Joplin_17_06_2021.jex
|
||||
# yarn start -- --profile "$PROFILE_DIR" import ~/Desktop/Tout_18_06_2021.jex
|
||||
yarn start -- --profile "$PROFILE_DIR" sync --use-lock 1
|
||||
yarn start --profile "$PROFILE_DIR" batch "$CMD_FILE"
|
||||
yarn start --profile "$PROFILE_DIR" import ~/Desktop/Joplin_17_06_2021.jex
|
||||
# yarn start --profile "$PROFILE_DIR" import ~/Desktop/Tout_18_06_2021.jex
|
||||
yarn start --profile "$PROFILE_DIR" sync --use-lock 1
|
||||
|
@ -101,11 +101,11 @@ do
|
||||
done
|
||||
|
||||
cd "$ROOT_DIR/packages/app-cli"
|
||||
yarn start -- --profile "$PROFILE_DIR" batch "$CMD_FILE"
|
||||
yarn start --profile "$PROFILE_DIR" batch "$CMD_FILE"
|
||||
|
||||
if [[ $COMMANDS != "" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cd "$ROOT_DIR/packages/app-desktop"
|
||||
yarn start -- --profile "$PROFILE_DIR"
|
||||
yarn start --profile "$PROFILE_DIR"
|
||||
|
@ -5,4 +5,4 @@
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
PLUGIN_PATH="$SCRIPT_DIR/../app-cli/tests/support/plugins/toc"
|
||||
yarn i --prefix="$PLUGIN_PATH" && yarn start -- --dev-plugins "$PLUGIN_PATH"
|
||||
yarn i --prefix="$PLUGIN_PATH" && yarn start --dev-plugins "$PLUGIN_PATH"
|
@ -542,7 +542,7 @@ async function loadEncryptionMasterKey(id: number = null, useExisting = false) {
|
||||
|
||||
function mustRunInBand() {
|
||||
if (!process.argv.includes('--runInBand')) {
|
||||
throw new Error('Tests must be run sequentially for this sync target, with the --runInBand arg. eg `npm test -- --runInBand`');
|
||||
throw new Error('Tests must be run sequentially for this sync target, with the --runInBand arg. eg `yarn test --runInBand`');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
"devDropTables": "node dist/app.js --env dev --drop-tables",
|
||||
"devDropDb": "node dist/app.js --env dev --drop-db",
|
||||
"start": "node dist/app.js",
|
||||
"generateTypes": "rm -f db-buildTypes.sqlite && yarn run start -- --env buildTypes migrate latest && node dist/tools/generateTypes.js && mv db-buildTypes.sqlite schema.sqlite",
|
||||
"generateTypes": "rm -f db-buildTypes.sqlite && yarn run start --env buildTypes migrate latest && node dist/tools/generateTypes.js && mv db-buildTypes.sqlite schema.sqlite",
|
||||
"tsc": "tsc --project tsconfig.json",
|
||||
"test": "jest --verbose=false",
|
||||
"test-ci": "yarn test",
|
||||
|
Loading…
Reference in New Issue
Block a user