diff --git a/README.md b/README.md index 9e5a360c3..3d0a92cbb 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ The table below shows the exact version of ACS deployed with each chart version/ | [6.0.2][6.0.2] | 7.4.0.1 | | 7.3.1 | 7.2.1.11 | 7.1.1.8 | 7.0.1.10 | 7.4.0.1 | | [6.1.0-M.1][6.1.0-M.1] | 23.1.0-A19 | 7.4.0.1 | 7.3.1 | 7.2.1.11 | 7.1.1.8 | 7.0.1.10 | 7.4.0.1 | | [7.0.0-M.1][7.0.0-M.1] | 23.1.0-A27 | 7.4.1 | 7.3.1 | 7.2.1.12 | 7.1.1.8 | 7.0.1.10 | 7.4.1 | +| [7.0.0-M.2][7.0.0-M.2] | 23.1.0-M4 | 7.4.1.1 | 7.3.1 | 7.2.1.12 | 7.1.1.8 | 7.0.1.10 | 7.4.1.1 | [5.0.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v5.0.1 [5.1.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v5.1.1 @@ -88,6 +89,7 @@ The table below shows the exact version of ACS deployed with each chart version/ [6.0.2]: https://github.com/Alfresco/acs-deployment/releases/tag/v6.0.2 [6.1.0-M.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v6.1.0-M.1 [7.0.0-M.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.0-M.1 +[7.0.0-M.2]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.0-M.2 ### Why there is no 5.4.0? @@ -154,8 +156,8 @@ Start the release by opening a PR against the appropriate branch that will: * Update the [versioning table](#versioning) * In [alfresco-content-services](helm/alfresco-content-services/Chart.yaml), - bump chart version to the version you want to release (usually by removing the - `-SNAPSHOT` suffix and adding `-M.x` suffix if it's a prerelease) + bump chart version to the version you want to release (use `-M.x` suffix if + it's a prerelease) * Run `pre-commit run --all-files helm-docs` to update helm docs * Edit [upgrades docs](docs/helm/upgrades.md) renaming the `To be released` section to the current version and create a new `To be released` section for @@ -176,22 +178,7 @@ removing dependabot entries and other not-really useful changelog entries. Publish the release (remove draft status). -Now proceed and open a PR to move back to the next development version: - -* In [alfresco-content-services](helm/alfresco-content-services/Chart.yaml), - bump chart version to the next development release (usually by increasing the - minor version and adding the `-SNAPSHOT` suffix) -* Run `pre-commit run --all-files helm-docs` to update docs - -Once the PR has been merged, overwrite and push the signed mutable tag with: - -```sh -git tag -d vx.x.x-SNAPSHOT -git tag -f -s vx.x.x-SNAPSHOT -m vx.x.x-SNAPSHOT -git push origin vx.x.x-SNAPSHOT --force -``` - -Once the tagged workflow is successful, the release process has completed. +Once the tagged workflow is successful, the release process is completed. ## How to update workflow diagrams of Alfresco latest version diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 13f5ee48a..d7ae22933 100644 --- a/helm/alfresco-content-services/Chart.lock +++ b/helm/alfresco-content-services/Chart.lock @@ -22,21 +22,21 @@ dependencies: version: 1.3.0 - name: alfresco-sync-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 4.3.0 + version: 4.4.0 - name: alfresco-search-enterprise repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 2.0.0-alpha.0 + version: 2.0.0 - name: alfresco-connector-msteams repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.2.0 - name: alfresco-share repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 0.1.0 + version: 0.1.1 - name: alfresco-connector-ms365 repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.4.0 - name: alfresco-ai-transformer repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.3.0 -digest: sha256:dd03e4dd3198c86c65e35b2ac43cb2883a91cd27b943319b3ecd6b19ded3d283 -generated: "2023-09-08T16:36:16.483837+02:00" +digest: sha256:95c0793bd427c4ef6def9c9a62e850896685e0b5f52230294eef6872508abb8d +generated: "2023-09-21T09:14:02.271557+02:00" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index b4f04d375..62db7ce63 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -4,7 +4,7 @@ # https://www.alfresco.com/platform/content-services-ecm/trial/download apiVersion: v2 name: alfresco-content-services -version: 7.0.0-M.1 +version: 7.0.0-M.2 appVersion: 23.1.0-M4 description: A Helm chart for deploying Alfresco Content Services keywords: @@ -50,10 +50,10 @@ dependencies: condition: alfresco-search.enabled - name: alfresco-sync-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 4.3.0 + version: 4.4.0 condition: alfresco-sync-service.enabled - name: alfresco-search-enterprise - version: 2.0.0-alpha.0 + version: 2.0.0 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: alfresco-search-enterprise.enabled - name: alfresco-connector-msteams @@ -62,7 +62,7 @@ dependencies: condition: alfresco-connector-msteams.enabled - name: alfresco-share alias: share - version: 0.1.0 + version: 0.1.1 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: share.enabled - name: alfresco-connector-ms365 diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 92e7bfe79..c4fecef38 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -1,6 +1,6 @@ # alfresco-content-services -![Version: 7.0.0-M.1](https://img.shields.io/badge/Version-7.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.1.0-M4](https://img.shields.io/badge/AppVersion-23.1.0--M4-informational?style=flat-square) +![Version: 7.0.0-M.2](https://img.shields.io/badge/Version-7.0.0--M.2-informational?style=flat-square) ![AppVersion: 23.1.0-M4](https://img.shields.io/badge/AppVersion-23.1.0--M4-informational?style=flat-square) A Helm chart for deploying Alfresco Content Services @@ -23,10 +23,10 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.1.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.4.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.2.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 2.0.0-alpha.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 2.0.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 1.3.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.1.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 4.3.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.1.1 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 4.4.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 0.2.0 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 |