From f7674db3503e55fcdcbaabcce7894265716a8f4c Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 16 Sep 2024 16:48:58 +0300 Subject: [PATCH 1/2] Fix labeler branch matching --- .github/labeler.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 3fb170149d86..5d109ca21fac 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -54,7 +54,7 @@ - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**', 'tgui/**'] - any-glob-to-any-file: [modular_ss220/**] - base-branch: 'master' - - head-branch: '!merge-upstream' + - head-branch: '^(?!merge-upstream$).*' ':finnadie: НЕ МОДУЛЬНО': - all: @@ -62,7 +62,7 @@ - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**'] - all-globs-to-all-files: '!modular_ss220/**' - base-branch: 'master' - - head-branch: '!merge-upstream' + - head-branch: '^(?!merge-upstream$).*' ':pray: Слияние с восходящим потоком': - all: From 6816ea90d37eed5f44d1484c72056f1854d9d903 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 16 Sep 2024 16:56:08 +0300 Subject: [PATCH 2/2] gihub -> github --- .github/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 5d109ca21fac..7b3a03de7afd 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -34,7 +34,7 @@ ':guitar: Инструменты': - changed-files: - - any-glob-to-any-file: ['.gihub/**', 'tools/**', '.vscode/**', '.bin/**'] + - any-glob-to-any-file: ['.github/**', 'tools/**', '.vscode/**', '.bin/**'] ':floppy_disk: Изменение конфига': - changed-files: