From 97e01009d69b8fbebfebf68f51e3d126d0ed43fc Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 30 Nov 2022 19:47:05 +0100
Subject: Merging upstream version 1.37.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/packaging.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.github/workflows/packaging.yml')

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index ec4e42c00..ddd8356e4 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -3,9 +3,13 @@
 name: Packages
 on:
   pull_request:
+    types:
+      - opened
+      - reopened
+      - labeled
+      - synchronize
     branches:
       - master
-      - develop
   push:
     branches:
       - master
@@ -45,9 +49,8 @@ jobs:
           from ruamel.yaml import YAML
           import json
           import re
-          FULL_CI_REGEX = '/actions run full ci'
+          import os
           ALWAYS_RUN_ARCHES = ["amd64", "x86_64"]
-          PR_BODY = """${{ github.event.pull_request.body }}"""
           yaml = YAML(typ='safe')
           entries = list()
           run_limited = False
@@ -55,7 +58,7 @@ jobs:
           with open('.github/data/distros.yml') as f:
               data = yaml.load(f)
 
-          if "${{ github.event_name }}" == "pull_request" and re.search(FULL_CI_REGEX, PR_BODY, re.I) is None:
+          if "${{ github.event_name }}" == "pull_request" and "${{ !contains(github.event.pull_request.labels.*.name, 'run-ci/packaging') }}":
               run_limited = True
 
           for i, v in enumerate(data['include']):
-- 
cgit v1.2.3