From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7237357611038801920 X-Received: by 2002:a05:6e02:609:b0:32a:fd29:26a8 with SMTP id t9-20020a056e02060900b0032afd2926a8mr510739ils.13.1685078630931; Thu, 25 May 2023 22:23:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1e03:b0:338:9256:74b6 with SMTP id g3-20020a056e021e0300b00338925674b6ls276222ila.0.-pod-prod-04-us; Thu, 25 May 2023 22:23:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7tWIUmjJ3gAKNx/APZOOadQWyEFuLgr/3VhKTfsJg0xu7ZaPusENBsQWBs0pztZT3oFWZQ X-Received: by 2002:a5e:c605:0:b0:766:454e:3cdd with SMTP id f5-20020a5ec605000000b00766454e3cddmr277136iok.20.1685078630289; Thu, 25 May 2023 22:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685078630; cv=none; d=google.com; s=arc-20160816; b=ezIHXLPNa58Wuyp6JQKA+FtrrbG/EOZ5FA8m4M587FhSHVUpElTiHmXzl4+7FDuWhO KBIFGAPtNY6ujneg9A/cO0gjP0J1KjrbIDoEVOGOjmMT1qpeTLoDGfQ5N8weJlB7op2r fq0BtCUUHSxfyjdFM/mFiHGW8w9q4bj9I1BZgHdRGaRdchGLi9H4y/Hbkk/ZCQNAV3GY onGNVGBg3VNWYR+/5X2EG/Kt6nlVrgFtkP9jmTEbF3JS3ONT4oS6cDoZT9UqFQfqHRQx kBMOFHr2gj5kh0OzMlEu0/bYdIjAF7aIX4S1F9mKIfkUAwLMnLU9mpQypAKqZby+RC0X PyNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=Ls5T1UUZIGU9NpKxDK0bp4pLlfDLyTXofp7jW7hsA0E=; b=t25+bXD+XeCg4ugQyTKxlCZfII6ywnccZjVgp/wc3+hoHKt7jrrvWFu28SSyYxy0Mx /1nDG2IwKtgJVafE7omEk7IkACq4Hr+xrbeXPuGxCkfqhWYizO9tHFEhrkYpimueqTrg USZ++OYtKfv2NvAWaGHWp33yqBmqRUnj2ZR17RR4bRzJdWMwa6TaLl+gN47ObN/9IDXg UC9OufizWvQaIG3SoB5o7Fi6EE3i9jDWYUoFPeDLJtl5cI1l0glSm9RkUyWI/qq5TQZP RBuAA8DhpTntU+vz/RjoPdBJf7K5PUkAbOWO9YTWtUJbuBw7kjN7baEXT2c+gk5fvglN XHqw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o9-20020a05660213c900b0077515a13c2dsi241308iov.1.2023.05.25.22.23.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 May 2023 22:23:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34Q5Ngoj012874 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 07:23:44 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 3/5] gitlab-ci: Switch to `rules` instead of `except` and `only` Date: Fri, 26 May 2023 07:23:40 +0200 Message-Id: <20230526052342.7945-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230526052342.7945-1-ubely@ilbers.de> References: <20230526052342.7945-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: yhi6JX6a6bjc Filters that use `rules` are more configurable and allow using several rules in the chain. Also, put `image` under `default` section instead of deprecated global declaration, with image version update to the latest one. Signed-off-by: Uladzimir Bely --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ded8469b..b700015c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ -image: ghcr.io/siemens/kas/kas-isar:3.2.3 +default: + image: ghcr.io/siemens/kas/kas-isar:3.2.3 variables: GIT_STRATEGY: clone @@ -24,22 +25,22 @@ variables: dev-ci: <<: *common-build - except: - - schedules + rules: + - if: $CI_PIPELINE_SOURCE != 'schedule' script: - scripts/ci_build.sh -T dev fast-ci: <<: *common-build - only: - - schedules + rules: + - if: $CI_PIPELINE_SOURCE == 'schedule' script: - scripts/ci_build.sh -T fast full-ci: <<: *common-build - only: - - schedules + rules: + - if: $CI_PIPELINE_SOURCE == 'schedule' script: - PREVIOUS_SHA="$(cat .CI_COMMIT_SHA || true)" - if [ "$CI_COMMIT_SHA" != "$PREVIOUS_SHA" ]; then -- 2.20.1