From 718a39614a759861fe6c8943d6bb541d26a6b957 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 12 Dec 2024 16:54:15 +0000 Subject: [PATCH 1/4] Split off 9.2.146 Signed-off-by: Jake Smith --- 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 13944efc3..b46c864e5 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.145-0-SNAPSHOT + 9.2.147-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index a5253af90..4bab574a4 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.145-0-SNAPSHOT + 9.2.147-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 01ce630a2..ea2987a1d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.145-0-SNAPSHOT + 9.2.147-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 855e55244..5cda86ab6 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.145-0-SNAPSHOT + 9.2.147-0-SNAPSHOT From 049e7a18494b0f71ce6b886aa03c43c5c643abd1 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Tue, 7 Jan 2025 09:47:48 -0500 Subject: [PATCH 2/4] HPCC4J-675 Disable invalid TLK test (#782) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../test/java/org/hpccsystems/dfs/client/DFSIndexTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java index 43c3437e7..ab49dbba7 100644 --- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java +++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java @@ -18,6 +18,7 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -114,7 +115,8 @@ public void setup() throws Exception } } - @Test + // Ignoring this test until underlying TLK support changes have been made + @Ignore @Test public void hpccTLKFilterTest() throws Exception { for (int i = 0; i < datasetNames.length; i++) From e8dbeb5e5f4d1e4106776d0cec97a31f0c339d1e Mon Sep 17 00:00:00 2001 From: James McMullan Date: Tue, 7 Jan 2025 14:27:13 -0500 Subject: [PATCH 3/4] HPCC4J-674 Removed deprecated feature from GithubAction (#783) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/baremetal-regression-suite.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml index b46baae07..24c2dfe36 100644 --- a/.github/workflows/baremetal-regression-suite.yml +++ b/.github/workflows/baremetal-regression-suite.yml @@ -129,11 +129,16 @@ jobs: latestVersionStr = ".".join(map(str, latestVersion)) latestVersionURL = 'https://cdn.hpccsystems.com/releases/CE-Candidate-' + latestVersionStr \ + '/bin/platform/hpccsystems-platform-community_' + latestVersionStr + '-1jammy_amd64_withsymbols.deb' - - print(f"::set-output name=previousVersion::{previousVersionStr}") - print(f"::set-output name=previousVersionURL::{previousVersionURL}") - print(f"::set-output name=latestVersion::{latestVersionStr}") - print(f"::set-output name=latestVersionURL::{latestVersionURL}") + + github_output_path = os.getenv('GITHUB_OUTPUT') + if github_output_path: + with open(github_output_path, 'a') as output_file: + output_file.write(f"previousVersion={previousVersionStr}\n") + output_file.write(f"previousVersionURL={previousVersionURL}\n") + output_file.write(f"latestVersion={latestVersionStr}\n") + output_file.write(f"latestVersionURL={latestVersionURL}\n") + else: + print('GITHUB_OUTPUT environment variable is not set.') - name: Install latest version run: | From d6a3975557ae985ec20bedfe82b06bfb284d4c33 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Thu, 9 Jan 2025 10:14:58 -0500 Subject: [PATCH 4/4] HPCC4J-676 Migrate Jirabot Improvements (#784) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/JirabotMerge.yml | 32 +++++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 201e0f621..ea5235341 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -13,15 +13,23 @@ jobs: if: github.event.pull_request.merged == true steps: - name: "Debug Vars" + env: + JIRA_URL : ${{ vars.JIRA_URL }} + PULL_REQUEST_NUMBER : ${{ github.event.pull_request.number }} + PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }} + PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }} + PULL_URL: ${{ github.event.pull_request.html_url }} + COMMENTS_URL: ${{ github.event.pull_request.comments_url }} + BRANCH_NAME: ${{ github.ref_name }} run: | - echo "JIRA_URL: ${{ vars.JIRA_URL }}" - echo "Pull Request Number: ${{ github.event.pull_request.number }}" - echo "Pull Request Title: ${{ github.event.pull_request.title }}" - echo "Pull Request Author Name: ${{ github.event.pull_request.user.login }}" - echo "Pull Request URL: ${{ github.event.pull_request.html_url }}" - echo "Comments URL: ${{ github.event.pull_request.comments_url }}" - echo "Branch Name: ${{ github.ref_name }}" - - uses: "actions/setup-python@v2" + echo "JIRA_URL: $JIRA_URL" + echo "Pull Request Number: $PULL_REQUEST_NUMBER" + echo "Pull Request Title: $PULL_REQUEST_TITLE" + echo "Pull Request Author Name: $PULL_REQUEST_AUTHOR_NAME" + echo "Pull Request URL: $PULL_URL" + echo "Comments URL: $COMMENTS_URL" + echo "Branch Name: $BRANCH_NAME" + - uses: "actions/setup-python@v5" with: python-version: "3.8" - name: "Install dependencies" @@ -33,7 +41,7 @@ jobs: python -m pip install --upgrade atlassian-python-api python -m pip install --upgrade jira - name: "Checkout" - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.base.ref }} fetch-depth: 0 @@ -51,6 +59,7 @@ jobs: COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH_NAME: ${{ github.ref_name }} + shell: python run: | import os import re @@ -255,7 +264,7 @@ jobs: sys.exit(1) project_prefixes = projectConfig.get('projectPrefixes') - if not project_prefixes: + if project_prefixes is None: 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) @@ -291,5 +300,4 @@ jobs: else: print('Unable to find Jira issue name in title') - print(result) - shell: python + print(result) \ No newline at end of file