Merge remote-tracking branch 'origin/candidate-9.4.x'

Signed-off-by: Gavin Halliday <[email protected]>
rpastrana · Feb 2, 2024 · 23bf3dd · 23bf3dd
2 parents 3d29435 + e705165
commit 23bf3dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml
@@ -1,19 +1,26 @@
 name: Jirabot - Merge
 
 on:
-  pull_request:
+  pull_request_target:
     types: [closed]
     branches:
       - "master"
       - "candidate-*"
 
-permissions: write-all
-
 jobs:
   jirabot:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     steps:
+      - name: "Debug Vars"
+        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"
         with:
           python-version: "3.8"
@@ -24,6 +31,12 @@ jobs:
           python -m site
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade jira
+      - name: "Checkout"
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.base.ref }}
+          fetch-depth: 0
+          fetch-tags: true
       - name: "Run"
         env:
           JIRABOT_USERNAME : ${{ secrets.JIRABOT_USERNAME }}
@@ -176,6 +189,11 @@ jobs:
             jirabot_user = os.environ['JIRABOT_USERNAME']
             jirabot_pass = os.environ['JIRABOT_PASSWORD']
             jira_url = os.environ['JIRA_URL']
+
+            if not jira_url:
+                jira_url = 'https://track.hpccsystems.com'
+                print('Jira URL us empty defaulting to: ' + jira_url)
+
             pr = os.environ['PULL_REQUEST_NUMBER']
             title = os.environ['PULL_REQUEST_TITLE']
             user = os.environ['PULL_REQUEST_AUTHOR_NAME']

diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml
@@ -55,7 +55,7 @@ jobs:
         def extractVersion(versionStr):
             parts = versionStr.split('.')
             if len(parts) != 3:
-                print('Invalid version: ' + version)
+                print('Invalid version: ' + versionStr)
                 sys.exit(1)
             if parts[2].lower() == 'x':
                 parts[2] = '0'
@@ -84,17 +84,12 @@ jobs:
                 print('Unable to extract version from git tag: ' + latestGitTag)
                 sys.exit(2)
 
-        def buildVersionString(version):
-            major, minor, point = map(int, version)
-            return f'{major}.{minor}.{point}'
-
         def getLatestBranchVersion(branchName):
 
             latestVersion = getTagVersionForCmd("git tag --list 'hpcc4j_*-release' --sort=-v:refname | head -n 1")
 
-            # If we are merging into master we assume it is going into the next minor release
             if branchName == 'master':
-                return buildVersionString([latestVersion[0], latestVersion[1] + 2, 0])
+                return [latestVersion[0], latestVersion[1], latestVersion[2]]
             else:
                 # Extract candidate branch major / minor version
                 candidateBranchPattern = re.compile(r'candidate-([0-9]+\.[0-9]+\.([0-9]+|x)).*')