Merge release into master branch (#331)

* prepare for next development iteration * Gh-310: Improve JUnit tests to run in parallel (#311) * Enable parallelism at class level with thread count equal to CPU threads Also fix config to apply always (not just profile) and remove outdated 'junit-platform-surefire-provider' dependency * Update versions for JUnit, AssertJ etc. * Fix Maven default platform encoding warning message * Gh-313: Upgrade json from 20211205 to 20230227 (#312) Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20230227. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update codecov (#315) * Gh 307: Upgrade workflows (#318) * Upgrade GitHub workflows * Version fix * Update .github/workflows/release.yaml Co-authored-by: GCHQDeveloper314 <[email protected]> * Remove unsupported actions and fix git config --------- Co-authored-by: GCHQDeveloper314 <[email protected]> * Gh-324: Make IterableConcat's type signature more flexible (#325) * Make IterableConcat type signature more flexible IterableConcat can now easily accept nested Iterables which extend Iterable in more cases * Fix example * Update copyright * Fix Quality Gate * Gh-236: Update GH actions (#327) fix versions, update release process and remove gh action * Gh-321: Add ChainedIterator varargs constructor and IterableMerge binary operator (#328) * add new iterable merge binary operator and varargs to chainedItr * checkstyle * address comments * checkstyle * Bump commons-io:commons-io from 2.11.0 to 2.14.0 (#323) * Bump commons-io:commons-io from 2.11.0 to 2.14.0 Bumps commons-io:commons-io from 2.11.0 to 2.14.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update copyright for pom.xml * copyright --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GCHQDeveloper314 <[email protected]> Co-authored-by: j69772 <[email protected]> Co-authored-by: cn337131 <[email protected]> * Gh-320: Javadoc fixes (#329) * fix javadocs * rephrase * copyright --------- Co-authored-by: j69772 <[email protected]> * Bump org.json:json from 20230227 to 20231013 (#330) Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: j69772 <[email protected]> * prepare release koryphe-2.6.0 * copyright --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Gaffer <[email protected]> Co-authored-by: GCHQDeveloper314 <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cn337131 <[email protected]> Co-authored-by: j69772 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
gchq · Jan 29, 2025 · 534efd6 · 534efd6
1 parent 9e83b68
commit 534efd6
Show file tree

Hide file tree

Showing 25 changed files with 392 additions and 295 deletions.
diff --git a/.github/release-notes.yml b/.github/release-notes.yml
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,23 @@
+changelog:
+  categories:
+    - title: Headliners
+      labels:
+        - headliner
+    - title: New Features
+      labels:
+        - feature
+    - title: Enhancements
+      labels:
+        - enhancement
+    - title: Bugs Fixed
+      labels:
+        - bug
+    - title: Documentation
+      labels:
+        - documentation
+    - title: Automation
+      labels:
+        - automation
+    - title: Other changes
+      labels:
+        - "*"
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -14,18 +14,18 @@ jobs:
     env:
      MAVEN_OPTS: -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '11'
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.m2/repository
@@ -43,4 +43,4 @@ jobs:
       run: mvn -B -q spotless:check
 
     - name: Upload Coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v4
diff --git a/.github/workflows/create-hotfix-branch.yaml b/.github/workflows/create-hotfix-branch.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -29,44 +29,27 @@ jobs:
 
     - name: Get latest tag
       if: ${{ !github.event.inputs.version }}
-      uses: actions-ecosystem/action-get-latest-tag@v1
+      run: echo "LATEST_TAG= $(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_ENV
       id: get-latest-tag
 
     - name: Format latest tag
       if: ${{ !github.event.inputs.version }}
-      run: echo "CURRENT_VERSION=$(echo ${{ steps.get-latest-tag.outputs.tag }} | sed 's/^koryphe-//')" >> $GITHUB_ENV
+      run: echo "CURRENT_VERSION=$(echo ${{ env.LATEST_TAG }} | sed 's/^koryphe-//')" >> $GITHUB_ENV
 
-    - name: Bump latest tag variable
+    - name: Bump latest tag variable version
       if: ${{ !github.event.inputs.version }}
-      uses: actions-ecosystem/action-bump-semver@v1
-      id: bump-semver
-      with:
-        current_version: ${{ env.CURRENT_VERSION }}
-        level: patch
-
-    - name: Set version automatically
-      if: ${{ !github.event.inputs.version }}
-      run: echo "RELEASE_VERSION=$(echo ${{ steps.bump-semver.outputs.new_version }} )" >> $GITHUB_ENV
+      run: echo "RELEASE_VERSION=$(echo ${{ env.CURRENT_VERSION }} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)/echo \1.\2.$((\3+1))/' | sh)" >> $GITHUB_ENV
 
     - name: Verify version regex
-      uses: actions-ecosystem/action-regex-match@v2
-      id: regex-match
-      with:
-        text: ${{ env.RELEASE_VERSION }}
-        # Ensure version doesn't end in .0
-        regex: '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.([1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
-
-    - name: Fail if incorrect version
-      if: ${{ !steps.regex-match.outputs.match }}
-      run: exit 1
+      run: echo ${{ env.RELEASE_VERSION }} | grep -E '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
 
     - name: Set hotfix branch
       run: echo "BRANCH_NAME=$(echo hotfix/${{ env.RELEASE_VERSION }} )" >> $GITHUB_ENV
 
     - name: Set up Github credentials
       run: |
-        git config user.name Gaffer
-        git config user.email github-actions@github.com
+        git config user.name github-actions[bot]
+        git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
     - name: Update versions
       run: |

diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
@@ -1,11 +1,9 @@
 name: Create Release Branch
 
 on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release Branch Version'
-        required: false
+  milestone:
+    types:
+    - closed
 
 env:
   artifactId: koryphe
@@ -17,56 +15,22 @@ jobs:
 
     steps:
     - name: Checkout develop
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         ref: develop
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         fetch-depth: 0
 
-    - name: Set version from input
-      if: ${{ github.event.inputs.version }}
-      run: echo "RELEASE_VERSION=$(echo ${{ github.event.inputs.version }} | sed 's/^v//')" >> $GITHUB_ENV
-
-    - name: Get latest tag
-      if: ${{ !github.event.inputs.version }}
-      uses: actions-ecosystem/action-get-latest-tag@v1
-      id: get-latest-tag
-
-    - name: Format latest tag
-      if: ${{ !github.event.inputs.version }}
-      run: echo "CURRENT_VERSION=$(echo ${{ steps.get-latest-tag.outputs.tag }} | sed 's/^koryphe-//')" >> $GITHUB_ENV
-
-    - name: Bump latest tag variable
-      if: ${{ !github.event.inputs.version }}
-      uses: actions-ecosystem/action-bump-semver@v1
-      id: bump-semver
-      with:
-        current_version: ${{ env.CURRENT_VERSION }}
-        level: minor
-
-    - name: Set version automatically
-      if: ${{ !github.event.inputs.version }}
-      run: echo "RELEASE_VERSION=$(echo ${{ steps.bump-semver.outputs.new_version }} )" >> $GITHUB_ENV
-
-    - name: Verify version regex
-      uses: actions-ecosystem/action-regex-match@v2
-      id: regex-match
-      with:
-        text: ${{ env.RELEASE_VERSION }}
-        # Ensure valid semver version
-        regex: '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
-
-    - name: Fail if incorrect version
-      if: ${{ !steps.regex-match.outputs.match }}
-      run: exit 1
+    - name: Set version from milestone
+      run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }})" >> $GITHUB_ENV
 
     - name: Set release branch
       run: echo "BRANCH_NAME=$(echo release/${{ env.RELEASE_VERSION }} )" >> $GITHUB_ENV
 
     - name: Set up Github credentials
       run: |
-        git config user.name Gaffer
-        git config user.email github-actions@github.com
+        git config user.name github-actions[bot]
+        git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
     - name: Update versions
       run: |
@@ -77,3 +41,14 @@ jobs:
         git checkout -b $BRANCH_NAME
         git commit -a -m "prepare release $artifactId-$RELEASE_VERSION"
         git push --set-upstream origin $BRANCH_NAME
+
+    - name: Tag release branch
+      run: |
+        git tag koryphe-$RELEASE_VERSION
+        git push origin --tags
+
+    - name: Create PR to master
+      run: |
+        gh pr create -B master -H $BRANCH_NAME --title 'Merge release into master branch' --body 'Created by GH Action'
+      env:
+        GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
diff --git a/.github/workflows/link-issue.yml b/.github/workflows/link-issue.yml
@@ -7,7 +7,7 @@ jobs:
   issue-links:
     runs-on: ubuntu-latest
     steps:
-    - uses: tkt-actions/add-issue-links@v1.6.0
+    - uses: tkt-actions/add-issue-links@v1.8.2
       with:
         repo-token: '${{ secrets.GITHUB_TOKEN }}'
         branch-prefix: 'gh-'

diff --git a/.github/workflows/release-standalone.yaml b/.github/workflows/release-standalone.yaml
@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         ref: master