From 184420078666c5f4f3e33ab96174239766b4f9d4 Mon Sep 17 00:00:00 2001
From: Jeffrey D <11084623+Nephery@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:27:38 -0400
Subject: [PATCH 1/2] Fix action permissions (#41)

---
 .github/workflows/build-test.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index ecb9f6f..3539441 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -5,10 +5,23 @@ name: build
 on:
   pull_request:
   push:
+  workflow_dispatch:
 
 jobs:
-  build:
+  dupe_check:
+    name: Check for Duplicate Workflow Run
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5.3.1
+        with:
+          concurrent_skipping: same_content
+          do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
 
+  build:
+    if: needs.dupe_check.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
 
     steps:
@@ -20,6 +33,17 @@ jobs:
           java-version: '17'
           overwrite-settings: false
           cache: 'maven'
+      - name: Manually Install Test Support If Necessary
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y libxml2-utils
+          version="$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="properties"]/*[local-name()="solace.integration.test.support.version"]/text()' pom.xml)"
+          echo "Detected test support version: ${version}"
+
+          git clone --depth 1 --branch "${version}" https://github.com/SolaceDev/solace-integration-test-support.git
+          cd "${GITHUB_WORKSPACE}/solace-integration-test-support"
+          mvn install -DskipTests
       - name: Build and run Tests
         run: mvn clean verify --settings "${GITHUB_WORKSPACE}/maven/settings.xml"
         env:

From 6e9f39ad4f8245d9233df3eb992f90b284533484 Mon Sep 17 00:00:00 2001
From: Jeffrey Douangpaseuth <11084623+Nephery@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:31:26 -0400
Subject: [PATCH 2/2] fix manual test support install version

---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 3539441..87164ec 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -43,7 +43,7 @@ jobs:
 
           git clone --depth 1 --branch "${version}" https://github.com/SolaceDev/solace-integration-test-support.git
           cd "${GITHUB_WORKSPACE}/solace-integration-test-support"
-          mvn install -DskipTests
+          mvn install -Dchangelist= -DskipTests
       - name: Build and run Tests
         run: mvn clean verify --settings "${GITHUB_WORKSPACE}/maven/settings.xml"
         env: