From 6b96072d00e7c5aea0631827705906a1648e6aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 6 Sep 2023 21:45:50 +0100
Subject: [PATCH] test2

---
 .woodpecker/can_master_build.yml | 16 ----------------
 .woodpecker/run_lint.yml         | 16 ----------------
 .woodpecker/run_tests.yml        |  4 ++++
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 .woodpecker/can_master_build.yml
 delete mode 100644 .woodpecker/run_lint.yml

diff --git a/.woodpecker/can_master_build.yml b/.woodpecker/can_master_build.yml
deleted file mode 100644
index c8330c507..000000000
--- a/.woodpecker/can_master_build.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-steps:
-  build:
-    image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
-    commands:
-      - pwd #bump
-      - ./gradlew assembleDebug --stacktrace
-
-#when:
-#repo: Freeyourgadget/Gadgetbridge
-#branch: master
-#this doesn't work yet:
-#https://github.com/woodpecker-ci/woodpecker/issues/687
-
-when:
-  event:
-    exclude: cron
diff --git a/.woodpecker/run_lint.yml b/.woodpecker/run_lint.yml
deleted file mode 100644
index d3a8ea93b..000000000
--- a/.woodpecker/run_lint.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-steps:
-  tests:
-    image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
-    commands:
-      - pwd #bump
-      - ./gradlew lint
-
-#when:
-#repo: Freeyourgadget/Gadgetbridge
-#branch: master
-#this doesn't work yet:
-#https://github.com/woodpecker-ci/woodpecker/issues/687
-
-when:
-  event:
-    exclude: cron
diff --git a/.woodpecker/run_tests.yml b/.woodpecker/run_tests.yml
index 9d20ca577..88ecabe11 100644
--- a/.woodpecker/run_tests.yml
+++ b/.woodpecker/run_tests.yml
@@ -4,12 +4,16 @@ steps:
     commands:
       - pwd #bump
       - ./gradlew :app:testBangleDebugUnitTest :app:testMainDebugUnitTest
+      # mark pipeline as failed if the tests failed, but linter will still run
+      - '[ "$CI_STEP_STATUS" == "success" ] || touch .pipeline_failure'
+    failure: ignore
 
   lint:
     image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
     commands:
       - pwd #bump
       - ./gradlew lint
+      - if [ -f .pipeline_failure ]; then return 1; fi
 
 #when:
 #repo: Freeyourgadget/Gadgetbridge