Skip to content

Commit ea19fe3

Browse files
Merge pull request #204 from aunetx/josselinonduty/issue202
[ENH] Stop build (and ci) when a failing hunk is detected
2 parents 55a07f1 + 0d3e14a commit ea19fe3

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ prepare: clean install_build_deps
4040
@npm run prettier -- --write "$(APP_DIR)/build/*.{js,html}" --config .prettierrc.json --ignore-path /dev/null
4141

4242
@echo "--------------------------------"
43-
@$(foreach p,$(wildcard ./patches/*), echo "Applying $(p)"; patch -p 1 -d $(APP_DIR) < $(p) && echo "Applied $(p)\n";)
43+
@set -e; \
44+
for p in ./patches/*; do \
45+
echo "Applying $$p"; \
46+
patch -p 1 -d $(APP_DIR) < $$p; \
47+
echo "Applied $$p\n"; \
48+
done
4449

4550
@echo "Append package-append.json to the package.json of the app"
4651
@echo "Adds electron, elecron-builder dependencies, prod and build directives"

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ Other packages can be installed from your package manager, either by clicking on
3535
| `--start-in-tray` | Start the app in the tray (see [patch](./patches/01-start-in-tray.patch)) |
3636
| `--disable-systray` | Quit the app when the window is closed (see [patch](./patches/02-start-without-tray.patch)) |
3737
| `--keep-kernel` | Use the exact kernel version (see [patch](./patches/04-remove-os-information.patch)) <br/> _This feature impacts privacy._ |
38-
| `--disable-features` | Disable some features (see [patch](./patches/05-provide-metadata-mpris.patch)) |
3938
| `--hide-offline-banner` | Hide the "Application is offline" banner that appears when using a VPN or DNS blocker (see [patch](./patches/08-hide-offline-banner.patch)) |
4039
| `--disable-animations` | Disable animations (see [patch](./patches/09-disable-animations.patch)) |
4140
| `--disable-notifications` | Disable notifications (see [patch](./patches/10-disable-notifications.patch)) |
42-
| `--disable-hardware-acceleration` | Disable hardware acceleration (useful for systems with GPU issues) (see [patch](./patches/13-disable-hardware-acceleration.patch)) |
41+
| `--disable-hardware-acceleration` | Disable hardware acceleration (useful for systems with GPU issues) (see [patch](./patches/13-disable-hardware-acceleration.patch)) |
4342
| `--log-level` | Set the log level (`silly`,`debug`,`verbose`,`info`,`warn`,`error`) (see [patch](./patches/06-control-log-level.patch)) |
4443
| `--enable-wayland-ime` `--ozone-platform-hint=auto` `--wayland-text-input-version=3` | Enable IME keyboard support on Wayland |
4544

@@ -52,7 +51,7 @@ Other packages can be installed from your package manager, either by clicking on
5251
| `DZ_HIDE_OFFLINE_BANNER` | `yes`,`no` | Hide the "Application is offline" banner (see [patch](./patches/08-hide-offline-banner.patch)) |
5352
| `DZ_DISABLE_ANIMATIONS` | `yes`,`no` | Disable animations (see [patch](./patches/09-disable-animations.patch)) |
5453
| `DZ_DISABLE_NOTIFICATIONS` | `yes`,`no` | Disable notifications (see [patch](./patches/10-disable-notifications.patch)) |
55-
| `DZ_DISABLE_HARDWARE_ACCELERATION` | `yes`,`no` | Disable hardware acceleration (see [patch](./patches/13-disable-hardware-acceleration.patch)) |
54+
| `DZ_DISABLE_HARDWARE_ACCELERATION` | `yes`,`no` | Disable hardware acceleration (see [patch](./patches/13-disable-hardware-acceleration.patch)) |
5655
| `DZ_DEVTOOLS` | `yes`,`no` | Enable the developer console (ctrl+shift+i) |
5756

5857
## Building from source

0 commit comments

Comments
 (0)