From 418be89f7dc64d53e279e4daa76b430e90fe9027 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Mon, 23 Sep 2024 16:29:46 +0100 Subject: [PATCH 1/3] Split off 9.4.98 Signed-off-by: Gavin Halliday --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 04b062447..054d6f3b5 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.97-0-SNAPSHOT + 9.4.99-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index ca7b0009e..8c507f3e3 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.97-0-SNAPSHOT + 9.4.99-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1ca671799..5bcf41a97 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.97-0-SNAPSHOT + 9.4.99-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 37fa5c79a..56ea31386 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.97-0-SNAPSHOT + 9.4.99-0-SNAPSHOT From 9d1e729f59f9587ff6c3e6b1ca5f9a0f26b16f44 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Mon, 23 Sep 2024 16:31:23 +0100 Subject: [PATCH 2/3] Split off 9.2.124 Signed-off-by: Gavin Halliday --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index ea8d08d2a..cbfd74ed0 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.123-0-SNAPSHOT + 9.2.125-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 07248ca9a..2b3f8d375 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.123-0-SNAPSHOT + 9.2.125-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7100d21e4..f5ba24b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.123-0-SNAPSHOT + 9.2.125-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index cd6a77539..9ac4595c0 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.123-0-SNAPSHOT + 9.2.125-0-SNAPSHOT From aca68bd08551dbe37a0481430f0492efd089477f Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 25 Sep 2024 09:47:16 -0400 Subject: [PATCH 3/3] HPCC4J-651 JirabotMerge: Allow multiple projects to be configured (#762) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/JirabotMerge.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 1aab53288..201e0f621 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -106,14 +106,14 @@ jobs: releaseTagPattern = releaseTagPrefix if major is not None: - releaseTagPattern += str(major) + '\.' + releaseTagPattern += str(major) + '\\.' else: - releaseTagPattern += '[0-9]+\.' + releaseTagPattern += '[0-9]+\\.' if minor is not None: - releaseTagPattern += str(minor) + '\.' + releaseTagPattern += str(minor) + '\\.' else: - releaseTagPattern += '[0-9]+\.' + releaseTagPattern += '[0-9]+\\.' if point is not None: releaseTagPattern += str(point) + '(-[0-9]+)?' @@ -254,14 +254,21 @@ jobs: print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') sys.exit(1) - project_name = projectConfig.get('projectName') - if project_name is None: - print('Error: PROJECT_CONFIG is missing required field: projectName') + project_prefixes = projectConfig.get('projectPrefixes') + if not project_prefixes: + print('Error: PROJECT_CONFIG is missing required field: projectPrefixes. Add a "projectPrefixes" JSON array of project prefix strings to the PROJECT_CONFIG.') sys.exit(1) + if not isinstance(project_prefixes, list): + print('Error: PROJECT_CONFIG field projectPrefixes is not a valid JSON array, aborting.') + sys.exit(1) + + project_list_regex = '|'.join(project_prefixes) + result = '' - issuem = re.search("(" + project_name + ")-[0-9]+", title, re.IGNORECASE) + issuem = re.search("(" + project_list_regex + ")-[0-9]+", title, re.IGNORECASE) if issuem: + project_name = issuem.group(1) issue_name = issuem.group() jira = Jira(url=jira_url, username=jirabot_user, password=jirabot_pass, cloud=True)