fix: confict
All checks were successful
ci/woodpecker/push/build-dev Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful

This commit is contained in:
2023-03-23 22:31:10 +01:00
parent 1ba91a85c7
commit 10e171369c
2 changed files with 2 additions and 2 deletions

View File

@@ -28,4 +28,4 @@ check if a container needs rebuilding
|-------------------------------------|-----------|-------- |-------------------------------------|-----------|--------
| `BASE` is more recent than `TARGET` | 0 | An update is needed | `BASE` is more recent than `TARGET` | 0 | An update is needed
| `TARGET` is more recent than `BASE` | 1 | No update is needed<br>(*the pipeline wil "fail" but that is wat we want* ) | `TARGET` is more recent than `BASE` | 1 | No update is needed<br>(*the pipeline wil "fail" but that is wat we want* )
| An error occured | 0 | So the pipeline can continue | An error occured | 0 | So the pipeline can continue

View File

@@ -154,4 +154,4 @@ if [ "$BASE_TIMESTAMP" -le "$TARGET_TIMESTAMP" ]; then
fi fi
echo "$TARGET needs updating" echo "$TARGET needs updating"
exit 0 exit 0