From d77da088f87604ae413e7d8b691fe3dd631a5180 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 11 May 2024 18:37:43 +0900
Subject: [PATCH] ci: tweak config

---
 .gitlab-ci.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0a8999aab..7e14cd61fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,15 +10,18 @@ services:
 
 workflow:
   rules:
-    - if: $CI_PROJECT_PATH == 'firefish/firefish'
-      when: always
-    - if: $CI_MERGE_REQUEST_PROJECT_PATH == 'firefish/firefish'
-      when: always
-    - if: $CI_PROJECT_PATH != 'firefish/firefish'
+    - if: $CI_PROJECT_PATH == 'firefish/firefish' || $CI_MERGE_REQUEST_PROJECT_PATH == 'firefish/firefish'
       changes:
         paths:
-          - .gitlab-ci.yml
-      when: never
+          - packages/**/*
+          - locales/**/*
+          - scripts/**/*
+          - package.json
+          - Cargo.toml
+          - Cargo.lock
+          - Dockerfile
+          - .dockerignore
+      when: always
     - when: never
 
 cache:
@@ -74,7 +77,6 @@ test:build:
           - packages/macro-rs/**/*
           - scripts/**/*
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
       when: always
@@ -100,7 +102,6 @@ test:build:backend_ts_only:
           - packages/macro-rs/**/*
           - scripts/**/*
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
       when: never 
@@ -137,7 +138,6 @@ test:build:client_only:
           - packages/macro-rs/**/*
           - scripts/**/*
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
       when: never
@@ -176,7 +176,6 @@ build:container:
           - locales/**/*
           - scripts/copy-assets.mjs
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
           - Dockerfile
@@ -292,7 +291,6 @@ container_scanning:
           - locales/**/*
           - scripts/copy-assets.mjs
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
           - Dockerfile