From aa006b5df9d99b20dacc1599396d127697113ead Mon Sep 17 00:00:00 2001
From: Matthew <mxw@cs.washington.edu>
Date: Wed, 7 Feb 2024 15:04:48 -0800
Subject: [PATCH] More helpful CI error message :)
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6214aa2..ce24ef5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ test:
- java GenerateSite
# heuristic to see if any lines were removed!
- git fetch origin main
- - '(exit $(git diff origin/main HEAD | grep "^-[^-]" | wc -l)) || { echo "Malformed merge request: at least one line is removed in diff." && (exit 1) }'
+ - '(exit $(git diff origin/main HEAD | grep "^-[^-]" | wc -l)) || { echo "Malformed merge request: at least one line is removed in diff, or feature branch is not up-to-date with the main branch." && (exit 1) }'
pages:
tags:
--
GitLab