diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 6c29e54c3..2a8a17620 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -1,5 +1,5 @@ --- -name: Bump component versions +name: Bump versions on: push: @@ -10,14 +10,68 @@ on: - '**' workflow_dispatch: inputs: + update-type: + description: 'Which dependencies to bump' + type: choice + options: + - charts + - values alfresco-updatecli-ref: description: "The version to use for alfresco/alfresco-updatecli configs" type: string default: master +env: + UPDATE_CLI_VERSION: v0.57.0 + jobs: - updatecli: + bump-charts-dependencies: + runs-on: ubuntu-latest + name: Helm charts dependencies + if: inputs.update-type == 'charts' + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.BOT_GITHUB_TOKEN }} + + - name: Login to quay.io + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_PASSWORD }} + + - name: Install Updatecli + uses: updatecli/updatecli-action@v2 + with: + version: ${{ env.UPDATE_CLI_VERSION }} + + - run: updatecli apply --experimental + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.1.0 + - name: Regenerate helm docs if necessary + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.1.0 + with: + pre-commit-args: helm-docs || true + skip_checkout: "true" + + - name: Git Auto Commit + uses: stefanzweifel/git-auto-commit-action@v4.16.0 + with: + commit_message: | + 🛠 Updatecli pipeline bump + commit_user_name: ${{ vars.BOT_GITHUB_USERNAME }} + commit_user_email: ${{ vars.BOT_GITHUB_EMAIL }} + branch: ${{ github.ref_name == 'main' && 'updatecli-bump-helm' || github.ref_name }} + create_branch: ${{ github.ref_name == 'main' }} + push_options: ${{ github.ref_name == 'main' && '--force' || '' }} + + bump-values-dependencies: runs-on: ubuntu-latest + name: Image tags values dependencies + if: inputs.update-type == 'values' steps: - name: Checkout uses: actions/checkout@v4 @@ -27,7 +81,7 @@ jobs: - name: Install Updatecli uses: updatecli/updatecli-action@v2 with: - version: v0.57.0 + version: ${{ env.UPDATE_CLI_VERSION }} - name: Checkout updatecli configs uses: actions/checkout@v4 diff --git a/README.md b/README.md index 9e5a360c3..493366ffb 100644 --- a/README.md +++ b/README.md @@ -144,11 +144,15 @@ First ensure that: * the [supported-matrix](https://github.com/Alfresco/alfresco-updatecli/blob/master/deployments/values/supported-matrix.yaml) reflects the status of the currently released Alfresco products and update if - necessary before proceeding with the release. -* the [Bump component - versions](https://github.com/Alfresco/acs-deployment/actions/workflows/bumpVersions.yml) + necessary before proceeding. +* the [components charts](https://github.com/Alfresco/alfresco-helm-charts) used + in [alfresco-content-services](helm/alfresco-content-services/Chart.yaml) have + been released in stable version (no pre-release version should be present in + Chart.yaml), with up-to-date components versions by running the [Bump versions + workflow](https://github.com/Alfresco/alfresco-helm-charts/actions/workflows/updatecli.yaml) +* the [Bump versions](https://github.com/Alfresco/acs-deployment/actions/workflows/bumpVersions.yml) workflow has been run to reflect the changes of the current `supported-matrix` - in the helm charts values files. + in the helm charts values files and to grab the latest helm charts dependencies. Start the release by opening a PR against the appropriate branch that will: diff --git a/updatecli.d/helm-autodiscovery.yaml b/updatecli.d/helm-autodiscovery.yaml index 56de83023..a8b6b97a1 100644 --- a/updatecli.d/helm-autodiscovery.yaml +++ b/updatecli.d/helm-autodiscovery.yaml @@ -1,11 +1,9 @@ name: "Helm autodiscovery for charts dependencies" - autodiscovery: crawlers: helm: # Increment manually because we have custom rules versionincrement: none - # Tags in values are handled via dedicated uber-manifest.tpl in - # alfresco-updatecli + # Tags in values are handled separately via uber-manifest.tpl ignorecontainer: true