Merge branch 'master' into feature/ACS-6300_Prepeare_Report_Portal_St…

…atic_Launch_Name
Alfresco · Nov 27, 2023 · 839ff46 · 839ff46
2 parents 9abae23 + ae5cb88
commit 839ff46
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 49 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@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v5.0.1
     - 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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
     - 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@v4.1.0
+        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
     - name: Get commit msg
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v4.1.0
+        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v5.0.1
     - name: Get a namespace to deploy on
       id: k8sns
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v4.1.0
+        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v5.0.1
       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@v4.1.0
+        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v5.0.1
       with:
         namespace: ${{ steps.k8sns.outputs.namespace }}
     - name: Uninstall Helm releases

diff --git a/.github/actions/docker-build-image/action.yml b/.github/actions/docker-build-image/action.yml
@@ -30,12 +30,6 @@ inputs:
   ghcr-token:
     description: Github token to connect to GHCR
     required: true
-  aws-access-key-id:
-    description: AWS access key id to connect to ECR
-    required: false
-  aws-secret-access-key:
-    description: AWS secret access key to connect to ECR
-    required: false
   aws-account-id:
     description: AWS account id to connect to ECR
     required: true
@@ -176,8 +170,6 @@ runs:
       if: env.PUSH_IMAGE == 'true'
       uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
       with:
-        aws-access-key-id: ${{ inputs.aws-access-key-id }}
-        aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
         aws-region: ${{ inputs.aws-region }}
         role-to-assume: arn:aws:iam::${{ inputs.aws-account-id }}:role/${{ inputs.aws-role-name }}
         role-session-name: gh-${{ env.IMAGE_REPOSITORY }}

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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
     - name: "Get build info"
       run: |
         [[ $GITHUB_EVENT_NAME == "pull_request" ]] && IS_PULL_REQUEST="true" || IS_PULL_REQUEST="false"

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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
       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
@@ -44,21 +44,21 @@ runs:
       run: |
         echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v5.0.1
       with:
         new-version: ${{ env.VERSION }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
         chart-dir: ${{ inputs.chart-dir }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
       if: steps.check-tag.outputs.exists == 'false'
       with:
         username: ${{ inputs.git-username }}
@@ -75,7 +75,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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v5.0.1
       with:
         chart-dir: ${{ inputs.chart-dir }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
@@ -88,7 +88,7 @@ runs:
 
     - name: Publish Helm chart
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v5.0.1
       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
@@ -13,7 +13,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.0.1
     - name: Update version
       shell: bash
       env:

diff --git a/.github/actions/maven-build-and-tag/action.yml b/.github/actions/maven-build-and-tag/action.yml
@@ -121,7 +121,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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v5.0.1
       with:
         property-to-update: ${{ inputs.property-to-update }}
         maven-cli-opts: ${{ steps.compute-maven-options.outputs.result }}
@@ -216,7 +216,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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
       with:
         username: ${{ inputs.git-username }}
         add-options: -u

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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
 
     - 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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v5.0.1
       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
@@ -82,7 +82,7 @@ runs:
         echo "result=$RESULT" >> $GITHUB_OUTPUT
 
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
 
     - name: Send slack notification
       id: slack

diff --git a/.github/actions/setup-helm-docs/action.yml b/.github/actions/setup-helm-docs/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.0.1
       with:
         repo: norwoodj/helm-docs
         version: ${{ inputs.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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v5.0.1
       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@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v5.0.1
       with:
         version: ${{ steps.resolve-version.outputs.version }}
         maven-cli-opts: ${{ inputs.maven-cli-opts }}

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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v5.0.1
         with:
           java-version: ${{ inputs.java-version }}
           java-distribution: ${{ inputs.java-distribution }}
@@ -107,11 +107,11 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v5.0.1
         with:
           java-version: ${{ inputs.java-version }}
           java-distribution: ${{ inputs.java-distribution }}
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v5.0.1
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           email: ${{ secrets.BOT_GITHUB_EMAIL }}

diff --git a/.github/workflows/helm-publish-new-package-version.yml b/.github/workflows/helm-publish-new-package-version.yml
@@ -42,7 +42,7 @@ jobs:
 
       - id: next-release
         name: Calculate next internal release
-        uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v5.0.1
         with:
           next-version: ${{ inputs.next-version }}
 
@@ -53,12 +53,12 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Update chart version
-        uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v5.0.1
         with:
           new-version: ${{env.VERSION}}
           chart-dir: ${{ inputs.chart-dir }}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           add-options: -u
@@ -69,15 +69,15 @@ jobs:
 
       - name: Package Helm Chart
         id: package-helm-chart
-        uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v5.0.1
         with:
           chart-dir: ${{ inputs.chart-dir }}
 
       - name: Push tag
         run: git push origin $VERSION
 
       - name: Publish Helm chart
-        uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@92947f8dee1180182ac6cf516edce1d4eb7d9b38 # v3.9.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v5.0.1
         with:
             helm-charts-repo: ${{ inputs.helm-charts-repo }}
             helm-charts-repo-branch: ${{ inputs.helm-charts-repo-branch }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,6 +15,9 @@ jobs:
         uses: ./.github/actions/pre-commit
       - name: Ensure SHA pinned actions
         uses: zgosalvez/github-actions-ensure-sha-pinned-actions@b35f285b9bb7e80de0967367cee66d3b6d50ceca # v3.0.1
+        with:
+          allowlist: |
+            Alfresco/alfresco-build-tools/
   test:
     runs-on: ubuntu-latest
     steps:

diff --git a/docs/README.md b/docs/README.md
@@ -1,11 +1,10 @@
 # alfresco-build-tools
 
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/fd8899233e1246c0b48a0684ada35d05)](https://www.codacy.com/gh/Alfresco/alfresco-build-tools/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Alfresco/alfresco-build-tools&amp;utm_campaign=Badge_Grade)
-
-| Build     | Status                                                                                                                                                                      |
-|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| GitHub    | [![CI](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/test.yml/badge.svg)](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/test.yml) |
+[![Last release](https://img.shields.io/github/v/release/alfresco/alfresco-build-tools)](https://github.com/Alfresco/alfresco-build-tools/releases/latest)
+[![CI](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/test.yml/badge.svg)](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/test.yml)
+[![CI with BATS 🦇](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/test-with-bats.yml/badge.svg)](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/test-with-bats.yml)
+[![Release](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/release.yml/badge.svg)](https://github.com/Alfresco/alfresco-build-tools/actions/workflows/release.yml)
+[![GitHub contributors](https://img.shields.io/github/contributors/alfresco/alfresco-build-tools)](https://github.com/Alfresco/alfresco-build-tools/graphs/contributors)
 
 This repository contains shared/reusable CI configurations for GitHub Actions to serve the repositories of the Alfresco org but virtually usable by everyone.