Skip to content

Commit 2e2623c

Browse files
gionngionn
authored
Merge branch 'master' into improvement/ACS-9385-cache-key-distinguishing
2 parents e0c3597 + b9391aa commit 2e2623c

File tree

29 files changed

+109
-46
lines changed

29 files changed

+109
-46
lines changed

‎.github/actions/calculate-next-internal-version/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: "composite"
2121
steps:
2222
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
23-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v8.14.1
23+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v8.15.0
2424
- id: next-prerelease-resolver
2525
run: ${{ github.action_path }}/next-prerelease.sh
2626
shell: bash

‎.github/actions/dbp-charts/publish-chart/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ runs:
2626
with:
2727
fetch-depth: 0
2828
- name: Get branch name
29-
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
29+
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
3030
- name: Publish
3131
run: ${{ github.action_path }}/publish_chart.sh
3232
shell: bash

‎.github/actions/dbp-charts/verify-helm/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ runs:
8585
password: ${{ inputs.docker_password }}
8686
- name: Get branch name
8787
uses: >-
88-
Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
88+
Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
8989
- name: Get commit msg
9090
uses: >-
91-
Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v8.14.1
91+
Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v8.15.0
9292
- name: Get a namespace to deploy on
9393
id: k8sns
9494
uses: >-
95-
Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v8.14.1
95+
Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v8.15.0
9696
with:
9797
branch_name: ${{ env.BRANCH_NAME }}
9898
release_prefix: ${{ inputs.release_prefix }}
@@ -111,7 +111,7 @@ runs:
111111
- name: Upload helm deployments logs as artifacts
112112
if: always()
113113
uses: >-
114-
Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v8.14.1
114+
Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v8.15.0
115115
with:
116116
namespace: ${{ steps.k8sns.outputs.namespace }}
117117
- name: Uninstall Helm releases

‎.github/actions/enforce-pr-conventions/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: composite
2121
steps:
2222
- name: Get branch name
23-
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
23+
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
2424

2525
- name: Check is Dependabot PR or Propagation PR
2626
id: check

‎.github/actions/get-build-info/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Get build-related info from GitHub and load it as generically name
33
runs:
44
using: composite
55
steps:
6-
- uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
6+
- uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
77
- name: "Get build info"
88
run: |
99
[[ $GITHUB_EVENT_NAME == "pull_request" ]] && IS_PULL_REQUEST="true" || IS_PULL_REQUEST="false"

‎.github/actions/github-check-upcoming-runs/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: "composite"
2121
steps:
2222
- name: Get branch name
23-
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
23+
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
2424

2525
- name: Check upcoming runs
2626
id: check

‎.github/actions/github-deployment-create/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
4141
- name: Update Deployment State
4242
if: ${{ inputs.state != '' }}
43-
uses: Alfresco/alfresco-build-tools/.github/actions/github-deployment-status-update@v8.14.1
43+
uses: Alfresco/alfresco-build-tools/.github/actions/github-deployment-status-update@v8.15.0
4444
with:
4545
github-token: ${{ inputs.github-token }}
4646
deployment-id: ${{ steps.create.outputs.id }}

‎.github/actions/helm-integration-tests/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
using: composite
3838
steps:
3939
- name: Setup rancher
40-
uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v8.14.1
40+
uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v8.15.0
4141
with:
4242
url: ${{ inputs.test-rancher-url }}
4343
access-key: ${{ inputs.test-rancher-access-key }}

‎.github/actions/helm-publish-chart/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ runs:
110110
fi
111111
112112
- name: Commit changes
113-
uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.14.1
113+
uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.15.0
114114
with:
115115
username: ${{ inputs.git-username }}
116116
add-options: .

‎.github/actions/helm-release-and-publish/action.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ runs:
4747
run: |
4848
echo "VERSION=$VERSION" >> $GITHUB_ENV
4949
50-
- uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.14.1
50+
- uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.15.0
5151
id: check-tag
5252
with:
5353
tag: ${{ env.VERSION }}
5454
repository-directory: ${{ inputs.chart-repository-dir }}
5555

5656
- name: Update chart version
5757
if: steps.check-tag.outputs.exists == 'false'
58-
uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v8.14.1
58+
uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v8.15.0
5959
with:
6060
new-version: ${{ env.VERSION }}
6161
chart-repository-dir: ${{ inputs.chart-repository-dir }}
6262
chart-dir: ${{ inputs.chart-dir }}
6363
helm-docs-version: ${{ inputs.helm-docs-version }}
6464

65-
- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.14.1
65+
- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.15.0
6666
if: steps.check-tag.outputs.exists == 'false'
6767
with:
6868
username: ${{ inputs.git-username }}
@@ -79,7 +79,7 @@ runs:
7979
- name: Package Helm Chart
8080
if: steps.check-tag.outputs.exists == 'false'
8181
id: package-helm-chart
82-
uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v8.14.1
82+
uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v8.15.0
8383
with:
8484
chart-dir: ${{ inputs.chart-dir }}
8585
chart-repository-dir: ${{ inputs.chart-repository-dir }}
@@ -92,7 +92,7 @@ runs:
9292

9393
- name: Publish Helm chart
9494
if: steps.check-tag.outputs.exists == 'false'
95-
uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v8.14.1
95+
uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v8.15.0
9696
with:
9797
helm-charts-repo: ${{inputs.helm-repository}}
9898
helm-charts-repo-branch: ${{ inputs.helm-repository-branch }}

‎.github/actions/helm-update-chart-version/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ inputs:
1616
runs:
1717
using: composite
1818
steps:
19-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v8.14.1
19+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v8.15.0
2020
with:
2121
version: ${{ inputs.helm-docs-version }}
2222
- name: Update version

‎.github/actions/kubectl-wait/action.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Kubectl wait
3+
description: >
4+
Wait for all resources inside a namespace to be ready
5+
inputs:
6+
namespace:
7+
description: Namespace to wait for
8+
required: false
9+
wait-timeout:
10+
description: Timeout for the wait command
11+
required: false
12+
default: 10m
13+
wait-condition:
14+
description: Condition to wait for
15+
required: false
16+
default: Ready
17+
wait-resource:
18+
description: Resource to wait for
19+
required: false
20+
default: pods
21+
runs:
22+
using: composite
23+
steps:
24+
- name: Set vars
25+
shell: bash
26+
run: |
27+
NAMESPACE_PARAM="${{ inputs.namespace != '' && format('-n {0}', inputs.namespace) || '' }}" >> $GITHUB_ENV
28+
29+
- name: Watch resources
30+
shell: bash
31+
run: |
32+
kubectl get ${{ inputs.wait-resource }} --watch $NAMESPACE_PARAM &
33+
kubectl wait --timeout=${{ inputs.wait-timeout }} --all=true --for=condition=${{ inputs.wait-condition }} ${{ inputs.wait-resource }} $NAMESPACE_PARAM
34+
35+
- name: Spit resources status after wait
36+
shell: bash
37+
if: always()
38+
run: |
39+
kubectl get ${{ inputs.wait-resource }} $NAMESPACE_PARAM
40+
kubectl describe ${{ inputs.wait-resource }} $NAMESPACE_PARAM

‎.github/actions/maven-build-and-tag/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ runs:
195195
- name: Update pom files to the new version
196196
id: update-pom-to-next-version
197197
if: github.event_name == 'push' || env.IS_PREVIEW == 'true'
198-
uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v8.14.1
198+
uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v8.15.0
199199
with:
200200
property-to-update: ${{ inputs.property-to-update }}
201201
maven-cli-opts: ${{ steps.compute-maven-options.outputs.result }}
@@ -298,7 +298,7 @@ runs:
298298
shell: bash
299299
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
300300

301-
- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.14.1
301+
- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.15.0
302302
if: github.event_name == 'push'
303303
with:
304304
username: ${{ inputs.git-username }}

‎.github/actions/maven-release/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ runs:
7575
path: '${{ env.REPO_DIR }}'
7676
token: ${{ inputs.github-token }}
7777

78-
- uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.14.1
78+
- uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v8.15.0
7979
id: check-tag
8080
with:
8181
tag: ${{ env.RELEASE_VERSION }}
@@ -147,7 +147,7 @@ runs:
147147
148148
- name: Commit changes
149149
if: steps.check-tag.outputs.exists == 'false'
150-
uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.14.1
150+
uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.15.0
151151
with:
152152
username: ${{ inputs.git-username }}
153153
add-options: -u

‎.github/actions/reportportal-prepare/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ runs:
4646
using: composite
4747
steps:
4848
- name: Get branch name
49-
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
49+
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
5050

5151
- name: Compute Report Portal input info
5252
id: info

‎.github/actions/send-slack-notification-slow-job/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
2626
- name: Slack Notification
2727
if: fromJSON(steps.fetch_time.outputs.total_time) > fromJSON(inputs.max-build-time-seconds)
28-
uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v8.14.1
28+
uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v8.15.0
2929
with:
3030
channel-id: ${{ inputs.slack-channel }}
3131
message: 'Max build time exceeded: took ${{ steps.fetch_time.outputs.total_time }} seconds (expected max: ${{ inputs.max-build-time-seconds }} seconds)'

‎.github/actions/send-slack-notification/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ runs:
109109
echo "result=$RESULT" >> $GITHUB_OUTPUT
110110
111111
- name: Get branch name
112-
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
112+
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
113113

114114
- name: Send slack notification
115115
id: slack

‎.github/actions/send-teams-notification/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ runs:
147147
echo "result=$RESULT" >> $GITHUB_OUTPUT
148148
149149
- name: Get branch name
150-
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.14.1
150+
uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.15.0
151151

152152
- name: Send teams notification
153153
uses: skitionek/notify-microsoft-teams@190d4d92146df11f854709774a4dae6eaf5e2aa3 # master

‎.github/actions/setup-helm-docs/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ outputs:
1111
runs:
1212
using: "composite"
1313
steps:
14-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.14.1
14+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.15.0
1515
with:
1616
repo: norwoodj/helm-docs
1717
version: ${{ inputs.version != '' && inputs.version || env.DEFAULT_HELM_DOCS_VERSION }}

‎.github/actions/setup-jx-release-version/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs:
88
runs:
99
using: "composite"
1010
steps:
11-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.14.1
11+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.15.0
1212
with:
1313
repo: jenkins-x-plugins/jx-release-version
1414
version: ${{ inputs.version }}

‎.github/actions/setup-kcadm/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ runs:
1515
ln -s keycloak-$KEYCLOAK_VERSION keycloak && ln -s ${PWD}/keycloak/bin/kcadm.sh /usr/local/bin
1616
kcadm.sh help
1717
env:
18-
DEFAULT_KEYCLOAK_VERSION: 26.1.2
18+
DEFAULT_KEYCLOAK_VERSION: 26.1.3

‎.github/actions/setup-terraform-docs/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs:
88
runs:
99
using: "composite"
1010
steps:
11-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.14.1
11+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.15.0
1212
with:
1313
repo: terraform-docs/terraform-docs
1414
version: ${{ inputs.version }}

‎.github/actions/setup-updatecli/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ inputs:
77
runs:
88
using: "composite"
99
steps:
10-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.14.1
10+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v8.15.0
1111
with:
1212
repo: updatecli/updatecli
1313
version: ${{ inputs.version }}

‎.github/actions/update-pom-to-next-pre-release/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runs:
3333
- id: next-prerelease-resolver
3434
name: Calculate next internal release
3535
if: inputs.version == ''
36-
uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v8.14.1
36+
uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v8.15.0
3737
with:
3838
next-version: ${{ steps.parse-next-final-version.outputs.result }}
3939
prerelease-type: ${{ inputs.prerelease-type }}
@@ -50,7 +50,7 @@ runs:
5050
fi
5151
5252
- name: Update pom files to the new version
53-
uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v8.14.1
53+
uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v8.15.0
5454
with:
5555
version: ${{ steps.resolve-version.outputs.version }}
5656
maven-cli-opts: ${{ inputs.maven-cli-opts }}

‎.github/dependabot.yml

+8
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,14 @@ updates:
353353
catch-all:
354354
patterns:
355355
- "*"
356+
- package-ecosystem: "github-actions"
357+
directory: "/.github/actions/kubectl-wait"
358+
schedule:
359+
interval: "weekly"
360+
groups:
361+
catch-all:
362+
patterns:
363+
- "*"
356364
- package-ecosystem: "github-actions"
357365
directory: "/.github/actions/load-release-descriptor"
358366
schedule:

‎.github/workflows/build-and-release-maven.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666
steps:
6767
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
68-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.14.1
68+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.15.0
6969
with:
7070
java-version: ${{ inputs.java-version }}
7171
java-distribution: ${{ inputs.java-distribution }}
@@ -107,11 +107,11 @@ jobs:
107107
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
108108
with:
109109
persist-credentials: false
110-
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.14.1
110+
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.15.0
111111
with:
112112
java-version: ${{ inputs.java-version }}
113113
java-distribution: ${{ inputs.java-distribution }}
114-
- uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.14.1
114+
- uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.15.0
115115
with:
116116
username: ${{ secrets.BOT_GITHUB_USERNAME }}
117117
email: ${{ secrets.BOT_GITHUB_EMAIL }}

0 commit comments

Comments
 (0)