From ff95fcd901c0aa8ead4f4024c315114f96108945 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Fri, 5 Apr 2024 11:24:51 -0400 Subject: [PATCH] ci: Switch only/except to rules Only and except are deprecated, at least don't seem to be working for the pages job. --- .gitlab-ci.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 382ec7493..948a35168 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,14 +175,12 @@ include: tar xf /tmp/cov-analysis-linux64.tgz ; mv cov-analysis-linux64-* coverity ; rm /tmp/cov-analysis-linux64.tgz - only: - variables: - - $COVERITY + rules: + - if: $COVERITY != null .not_coverity: - except: - variables: - - $COVERITY + rules: + - if: $COVERITY == null .build: before_script: @@ -563,6 +561,6 @@ pages: artifacts: paths: - public - only: - - 'master' - - '1.0' + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == '1.0'