aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml38
1 files changed, 19 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02f42400..89095565 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ include:
- templates/ubuntu.yml
stages:
- - precheck
- container prep
+ - precheck
- build
.common_variables:
@@ -25,24 +25,6 @@ stages:
LIBQRTR_BRANCH: 'main'
LIBMBIM_BRANCH: 'main'
-verify-dco:
- stage: precheck
- extends:
- - .fdo.distribution-image@ubuntu
- - .common_variables
- only:
- - merge_requests
- script: |
- if [[ -n "${CI_MERGE_REQUEST_DIFF_BASE_SHA}" ]]; then
- export COMMITS=$(git log --no-merges --format="%H" ${CI_MERGE_REQUEST_DIFF_BASE_SHA}.. | xargs)
- for c in "${COMMITS}"; do
- $(git log --format="%b" -1 ${c} | grep -q "^Signed-off-by: .* <.*@.*>") && rc="$?" || rc="$?"
- if [[ rc -eq 1 ]]; then
- echo "Commit ${c} failed DCO Signed-off-by check"
- fi
- done
- fi
-
build container:
extends:
- .fdo.container-build@ubuntu
@@ -88,6 +70,24 @@ before_script:
popd
fi
+verify-dco:
+ stage: precheck
+ extends:
+ - .fdo.distribution-image@ubuntu
+ - .common_variables
+ only:
+ - merge_requests
+ script: |
+ if [[ -n "${CI_MERGE_REQUEST_DIFF_BASE_SHA}" ]]; then
+ export COMMITS=$(git log --no-merges --format="%H" ${CI_MERGE_REQUEST_DIFF_BASE_SHA}.. | xargs)
+ for c in "${COMMITS}"; do
+ $(git log --format="%b" -1 ${c} | grep -q "^Signed-off-by: .* <.*@.*>") && rc="$?" || rc="$?"
+ if [[ rc -eq 1 ]]; then
+ echo "Commit ${c} failed DCO Signed-off-by check"
+ fi
+ done
+ fi
+
build-no-qmi:
stage: build
extends: