Merge branch 'master' into improvement/AAE-28530-teams-notifications-fix

Alfresco · Dec 6, 2024 · c9d508d · c9d508d
2 parents dfe93ee + cf10f6e
commit c9d508d
Show file tree

Hide file tree

Showing 29 changed files with 150 additions and 41 deletions.
diff --git a/.github/actions/calculate-next-internal-version/action.yml b/.github/actions/calculate-next-internal-version/action.yml
@@ -20,7 +20,7 @@ runs:
   using: "composite"
   steps:
     - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v8.6.0
     - id: next-prerelease-resolver
       run: ${{ github.action_path }}/next-prerelease.sh
       shell: bash

diff --git a/.github/actions/dbp-charts/publish-chart/action.yml b/.github/actions/dbp-charts/publish-chart/action.yml
@@ -26,7 +26,7 @@ runs:
       with:
         fetch-depth: 0
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
     - name: Publish
       run: ${{ github.action_path }}/publish_chart.sh
       shell: bash

diff --git a/.github/actions/dbp-charts/verify-helm/action.yml b/.github/actions/dbp-charts/verify-helm/action.yml
@@ -85,14 +85,14 @@ runs:
         password: ${{ inputs.docker_password }}
     - name: Get branch name
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
     - name: Get commit msg
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v8.5.0
+        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v8.6.0
     - name: Get a namespace to deploy on
       id: k8sns
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v8.5.0
+        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v8.6.0
       with:
         branch_name: ${{ env.BRANCH_NAME }}
         release_prefix: ${{ inputs.release_prefix }}
@@ -111,7 +111,7 @@ runs:
     - name: Upload helm deployments logs as artifacts
       if: always()
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v8.5.0
+        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v8.6.0
       with:
         namespace: ${{ steps.k8sns.outputs.namespace }}
     - name: Uninstall Helm releases

diff --git a/.github/actions/enforce-pr-conventions/action.yml b/.github/actions/enforce-pr-conventions/action.yml
@@ -20,7 +20,7 @@ runs:
   using: composite
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
 
     - name: Check is Dependabot PR or Propagation PR
       id: check

diff --git a/.github/actions/get-build-info/action.yml b/.github/actions/get-build-info/action.yml
@@ -3,7 +3,7 @@ description: "Get build-related info from GitHub and load it as generically name
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
     - name: "Get build info"
       run: |
         [[ $GITHUB_EVENT_NAME == "pull_request" ]] && IS_PULL_REQUEST="true" || IS_PULL_REQUEST="false"

diff --git a/.github/actions/github-check-upcoming-runs/action.yml b/.github/actions/github-check-upcoming-runs/action.yml
@@ -20,7 +20,7 @@ runs:
   using: "composite"
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
 
     - name: Check upcoming runs
       id: check

diff --git a/.github/actions/github-deployment-create/action.yml b/.github/actions/github-deployment-create/action.yml
@@ -40,7 +40,7 @@ runs:
 
     - name: Update Deployment State
       if: ${{ inputs.state != '' }}
-      uses: Alfresco/alfresco-build-tools/.github/actions/github-deployment-status-update@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/github-deployment-status-update@v8.6.0
       with:
         github-token: ${{ inputs.github-token }}
         deployment-id: ${{ steps.create.outputs.id }}

diff --git a/.github/actions/helm-integration-tests/action.yml b/.github/actions/helm-integration-tests/action.yml
@@ -37,7 +37,7 @@ runs:
   using: composite
   steps:
     - name: Setup rancher
-      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v8.6.0
       with:
         url: ${{ inputs.test-rancher-url }}
         access-key: ${{ inputs.test-rancher-access-key }}

diff --git a/.github/actions/helm-publish-chart/action.yml b/.github/actions/helm-publish-chart/action.yml
@@ -110,7 +110,7 @@ runs:
         fi
 
     - name: Commit changes
-      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.6.0
       with:
         username: ${{ inputs.git-username }}
         add-options: .

diff --git a/.github/actions/helm-release-and-publish/action.yml b/.github/actions/helm-release-and-publish/action.yml
@@ -47,22 +47,22 @@ runs:
       run: |
         echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.6.0
       id: check-tag
       with:
         tag: ${{ env.VERSION }}
         repository-directory: ${{ inputs.chart-repository-dir }}
 
     - name: Update chart version
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v8.6.0
       with:
         new-version: ${{ env.VERSION }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
         chart-dir: ${{ inputs.chart-dir }}
         helm-docs-version: ${{ inputs.helm-docs-version }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.6.0
       if: steps.check-tag.outputs.exists == 'false'
       with:
         username: ${{ inputs.git-username }}
@@ -79,7 +79,7 @@ runs:
     - name: Package Helm Chart
       if: steps.check-tag.outputs.exists == 'false'
       id: package-helm-chart
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v8.6.0
       with:
         chart-dir: ${{ inputs.chart-dir }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
@@ -92,7 +92,7 @@ runs:
 
     - name: Publish Helm chart
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v8.6.0
       with:
         helm-charts-repo: ${{inputs.helm-repository}}
         helm-charts-repo-branch: ${{ inputs.helm-repository-branch }}

diff --git a/.github/actions/helm-update-chart-version/action.yml b/.github/actions/helm-update-chart-version/action.yml
@@ -16,7 +16,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v8.6.0
       with:
         version: ${{ inputs.helm-docs-version }}
     - name: Update version

diff --git a/.github/actions/maven-build-and-tag/action.yml b/.github/actions/maven-build-and-tag/action.yml
@@ -178,7 +178,7 @@ runs:
     - name: Update pom files to the new version
       id: update-pom-to-next-version
       if: github.event_name == 'push' || env.IS_PREVIEW == 'true'
-      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v8.6.0
       with:
         property-to-update: ${{ inputs.property-to-update }}
         maven-cli-opts: ${{ steps.compute-maven-options.outputs.result }}
@@ -275,7 +275,7 @@ runs:
       shell: bash
       run: find . -name TEST-*.xml -exec grep -h testcase {} \; | awk -F '"' '{printf("%s#%s() - %.3fms\n", $4, $2, $6); }' | sort -n -k 3 | tail -20
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.6.0
       if: github.event_name == 'push'
       with:
         username: ${{ inputs.git-username }}

diff --git a/.github/actions/maven-release/action.yml b/.github/actions/maven-release/action.yml
@@ -75,7 +75,7 @@ runs:
         path: '${{ env.REPO_DIR }}'
         token: ${{ inputs.github-token }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.6.0
       id: check-tag
       with:
         tag: ${{ env.RELEASE_VERSION }}
@@ -147,7 +147,7 @@ runs:
 
     - name: Commit changes
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.6.0
       with:
         username: ${{ inputs.git-username }}
         add-options: -u

diff --git a/.github/actions/md-toc/action.yml b/.github/actions/md-toc/action.yml
@@ -0,0 +1,68 @@
+name: Markdown ToC Generator
+description: Generate a Table of Contents from a Markdown file
+inputs:
+  md_toc_version:
+    description: Markdown Table of Contents Package version
+    required: false
+    default: 1.2.0
+  md_src:
+    description: |
+      Markdown file(s) to generate Table of Contents for. It can be a list of
+      space separated files or a glob pattern relative to the repository root.
+    required: true
+  depth:
+    description: Depth of Table of Contents
+    required: false
+    default: '2'
+  dry_run:
+    description: Skip destructive actions
+    required: false
+    default: 'false'
+  append:
+    description: >-
+      A string to append to Table of Contents (e.g. you may want to append the
+      sha of the commit toc was added on top of?)
+    required: false
+    default: ''
+  bullets:
+    description: Bullets to use for Table of Contents ("*", "-" or "+")
+    required: false
+    default: ''
+  node_version:
+    description: Node.js version to install (false means do not install)
+    required: false
+    default: '20'
+runs:
+  using: 'composite'
+  steps:
+    - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+      if: ${{ inputs.node_install }}
+      with:
+        node-version: ${{ inputs.node_version }}
+    - name: Install Markdown ToC node package
+      run: npm install -g markdown-toc@${{ inputs.md_toc_version }}
+      shell: bash
+    - name: Generate Table of Contents
+      env:
+        MDTOC_IARG: ${{ inputs.dry_run == 'false' && '-i' || '' }}
+        MDTOC_BARG: ${{ inputs.bullets != '' && format('--bullets {0}', inputs.bullets) || '' }}
+      run: |
+        export MDTOC_ARGS="${{ env.MDTOC_IARG }} ${{ env.MDTOC_BARG }}"
+        for f in ${{ inputs.md_src }}; do
+          if [ -f $f ]; then
+            markdown-toc $MDTOC_ARGS \
+              --maxdepth ${{ inputs.depth }} \
+              --append "${{ inputs.append }}" $f && \
+            echo "Table of Contents successfully generated in ${{ inputs.md_src }}"
+          else
+            echo "File $f not found.. Skipping!"
+          fi
+        done
+      shell: bash
+    - name: Autocommit changes
+      if: inputs.dry_run == 'false'
+      uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
+      with:
+        commit_message: Auto update TOC in ${{ inputs.md_src }}
+        disable_globbing: true
+        file_pattern: ${{ inputs.md_src }}
diff --git a/.github/actions/reportportal-prepare/action.yml b/.github/actions/reportportal-prepare/action.yml
@@ -46,7 +46,7 @@ runs:
   using: composite
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
 
     - name: Compute Report Portal input info
       id: info

diff --git a/.github/actions/send-slack-notification-slow-job/action.yml b/.github/actions/send-slack-notification-slow-job/action.yml
@@ -25,7 +25,7 @@ runs:
 
     - name: Slack Notification
       if: fromJSON(steps.fetch_time.outputs.total_time) > fromJSON(inputs.max-build-time-seconds)
-      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v8.6.0
       with:
         channel-id: ${{ inputs.slack-channel }}
         message: 'Max build time exceeded: took ${{ steps.fetch_time.outputs.total_time }} seconds (expected max: ${{ inputs.max-build-time-seconds }} seconds)'

diff --git a/.github/actions/send-slack-notification/action.yml b/.github/actions/send-slack-notification/action.yml
@@ -109,7 +109,7 @@ runs:
         echo "result=$RESULT" >> $GITHUB_OUTPUT
 
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
 
     - name: Send slack notification
       id: slack

diff --git a/.github/actions/send-teams-notification/action.yml b/.github/actions/send-teams-notification/action.yml
@@ -120,7 +120,7 @@ runs:
         echo "result=$RESULT" >> $GITHUB_OUTPUT
 
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.6.0
 
     - name: Send teams notification
       uses: skitionek/notify-microsoft-teams@190d4d92146df11f854709774a4dae6eaf5e2aa3 # master

diff --git a/.github/actions/setup-helm-docs/action.yml b/.github/actions/setup-helm-docs/action.yml
@@ -11,7 +11,7 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.6.0
       with:
         repo: norwoodj/helm-docs
         version: ${{ inputs.version != '' && inputs.version || env.DEFAULT_HELM_DOCS_VERSION }}

diff --git a/.github/actions/setup-jx-release-version/action.yml b/.github/actions/setup-jx-release-version/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.6.0
       with:
         repo: jenkins-x-plugins/jx-release-version
         version: ${{ inputs.version }}

diff --git a/.github/actions/setup-terraform-docs/action.yml b/.github/actions/setup-terraform-docs/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.5.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.6.0
       with:
         repo: terraform-docs/terraform-docs
         version: ${{ inputs.version }}

diff --git a/.github/actions/update-pom-to-next-pre-release/action.yml b/.github/actions/update-pom-to-next-pre-release/action.yml
@@ -33,7 +33,7 @@ runs:
     - id: next-prerelease-resolver
       name: Calculate next internal release
       if: inputs.version == ''
-      uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v8.6.0
       with:
         next-version: ${{ steps.parse-next-final-version.outputs.result }}
         prerelease-type: ${{ inputs.prerelease-type }}
@@ -50,7 +50,7 @@ runs:
         fi
 
     - name: Update pom files to the new version
-      uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v8.5.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v8.6.0
       with:
         version: ${{ steps.resolve-version.outputs.version }}
         maven-cli-opts: ${{ inputs.maven-cli-opts }}

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -385,6 +385,14 @@ updates:
       catch-all:
         patterns:
           - "*"
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/md-toc"
+    schedule:
+      interval: "weekly"
+    groups:
+      catch-all:
+        patterns:
+          - "*"
   - package-ecosystem: "github-actions"
     directory: "/.github/actions/nexus-move-artifacts"
     schedule:

diff --git a/.github/workflows/build-and-release-maven.yml b/.github/workflows/build-and-release-maven.yml
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.5.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.6.0
         with:
           java-version: ${{ inputs.java-version }}
           java-distribution: ${{ inputs.java-distribution }}
@@ -107,11 +107,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.5.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.6.0
         with:
           java-version: ${{ inputs.java-version }}
           java-distribution: ${{ inputs.java-distribution }}
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.5.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.6.0
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           email: ${{ secrets.BOT_GITHUB_EMAIL }}