From b8e5b8616a96c3d239b0b74305c0556e3019c270 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 18 May 2024 20:49:13 +0900
Subject: [PATCH] ci: fix conditions
---
.gitlab-ci.yml | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 608a81c6df..8767af8e06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ test:build:
rules:
- if: $TEST == 'false'
when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/backend-rs/**/*
@@ -84,7 +84,7 @@ test:build:backend_ts_only:
rules:
- if: $TEST == 'false'
when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/backend-rs/**/*
@@ -94,7 +94,7 @@ test:build:backend_ts_only:
- Cargo.toml
- Cargo.lock
when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/backend/**/*
@@ -124,7 +124,7 @@ test:build:client_only:
rules:
- if: $TEST == 'false'
when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/backend-rs/**/*
@@ -134,7 +134,7 @@ test:build:client_only:
- Cargo.toml
- Cargo.lock
when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/client/**/*
@@ -206,9 +206,7 @@ cargo:test:
rules:
- if: $TEST == 'false'
when: never
- - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'main'
- when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/backend-rs/**/*
@@ -227,9 +225,7 @@ cargo:clippy:
rules:
- if: $TEST == 'false'
when: never
- - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'main'
- when: never
- - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_COMMIT_BRANCH == 'develop' || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
changes:
paths:
- packages/backend-rs/**/*