From 32090ac264d2bd787d4ed81d1515cfde5e3cc962 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 18 Sep 2023 01:15:58 -0700 Subject: [PATCH 1/2] AAE-16060 Fix Helm Release and Publish for RC workflows on some repositories (#324) --- .github/actions/helm-publish-chart/action.yml | 9 +++++++++ version.txt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/actions/helm-publish-chart/action.yml b/.github/actions/helm-publish-chart/action.yml index a2f5d19a0..90dcf157f 100644 --- a/.github/actions/helm-publish-chart/action.yml +++ b/.github/actions/helm-publish-chart/action.yml @@ -117,6 +117,15 @@ runs: commit-message: ${{ steps.compute-git-commit-message.outputs.result }} repository-directory: ${{ env.CHECKOUT_PATH }} + - name: Update remote branch + env: + GITHUB_TOKEN: ${{ inputs.token }} + working-directory: ${{ env.CHECKOUT_PATH }} + shell: bash + run: | + git pull --rebase + git push --dry-run origin + - name: Push changes if: inputs.do-push == 'true' env: diff --git a/version.txt b/version.txt index 6d260c3af..040943e56 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v3.2.0 +v3.2.1 From 3741d4445541db169728841ebedb8725b51f0b45 Mon Sep 17 00:00:00 2001 From: erdemedeiros Date: Mon, 18 Sep 2023 08:16:15 +0000 Subject: [PATCH 2/2] Release v3.2.1 --- .../actions/calculate-next-internal-version/action.yml | 2 +- .github/actions/dbp-charts/publish-chart/action.yml | 2 +- .github/actions/dbp-charts/verify-helm/action.yml | 8 ++++---- .github/actions/get-build-info/action.yml | 2 +- .github/actions/helm-integration-tests/action.yml | 2 +- .github/actions/helm-publish-chart/action.yml | 2 +- .github/actions/helm-release-and-publish/action.yml | 10 +++++----- .github/actions/helm-update-chart-version/action.yml | 2 +- .github/actions/maven-build-and-tag/action.yml | 4 ++-- .github/actions/maven-release/action.yml | 4 ++-- .github/actions/reportportal-prepare/action.yml | 2 +- .github/actions/send-slack-notification/action.yml | 2 +- .github/actions/setup-helm-docs/action.yml | 2 +- .github/actions/setup-jx-release-version/action.yml | 2 +- .github/actions/setup-terraform-docs/action.yml | 2 +- .../actions/update-pom-to-next-pre-release/action.yml | 4 ++-- .github/workflows/build-and-release-maven.yml | 6 +++--- .github/workflows/helm-publish-new-package-version.yml | 10 +++++----- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/actions/calculate-next-internal-version/action.yml b/.github/actions/calculate-next-internal-version/action.yml index 405dd72ad..b11225c9a 100644 --- 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@v2 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v3.2.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 index 36b4a3543..81f33ebb3 100644 --- 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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.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 index 1497f5fba..f083b58c9 100644 --- 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@v3.2.0 + Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.1 - name: Get commit msg uses: >- - Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v3.2.0 + Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v3.2.1 - name: Get a namespace to deploy on id: k8sns uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v3.2.0 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v3.2.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@v3.2.0 + Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v3.2.1 with: namespace: ${{ steps.k8sns.outputs.namespace }} - name: Uninstall Helm releases diff --git a/.github/actions/get-build-info/action.yml b/.github/actions/get-build-info/action.yml index 976707e98..823a5a641 100644 --- 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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.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 index 7f15c0ae1..76506b33b 100644 --- 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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v3.2.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 index 90dcf157f..d50ddd42d 100644 --- 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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.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 index 82ec6bfc2..8688152a3 100644 --- a/.github/actions/helm-release-and-publish/action.yml +++ b/.github/actions/helm-release-and-publish/action.yml @@ -44,7 +44,7 @@ runs: run: | echo "VERSION=$VERSION" >> $GITHUB_ENV - - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v3.2.1 id: check-tag with: tag: ${{ env.VERSION }} @@ -52,13 +52,13 @@ runs: - name: Update chart version if: steps.check-tag.outputs.exists == 'false' - uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v3.2.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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v3.2.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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v3.2.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 index 78bce9689..cf0f8e375 100644 --- 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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.2.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 index 9ba733b7c..4862c5f57 100644 --- 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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v3.2.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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.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 index edd95688f..8846d8a75 100644 --- a/.github/actions/maven-release/action.yml +++ b/.github/actions/maven-release/action.yml @@ -67,7 +67,7 @@ runs: path: '${{ env.REPO_DIR }}' token: ${{ inputs.github-token }} - - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v3.2.1 id: check-tag with: tag: ${{ env.RELEASE_VERSION }} @@ -138,7 +138,7 @@ runs: - name: Commit changes if: steps.check-tag.outputs.exists == 'false' - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.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 index 412e64119..38568f5af 100644 --- a/.github/actions/reportportal-prepare/action.yml +++ b/.github/actions/reportportal-prepare/action.yml @@ -42,7 +42,7 @@ runs: using: composite steps: - name: Get branch name - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.1 - name: Compute Report Portal input info id: info diff --git a/.github/actions/send-slack-notification/action.yml b/.github/actions/send-slack-notification/action.yml index 56cd59929..dbb28addb 100644 --- a/.github/actions/send-slack-notification/action.yml +++ b/.github/actions/send-slack-notification/action.yml @@ -75,7 +75,7 @@ runs: echo "result=$RESULT" >> $GITHUB_OUTPUT - name: Get branch name - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.2.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 index be0eef73d..901cc77c2 100644 --- 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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v3.2.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 index fa8d45cbf..d056a9366 100644 --- 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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v3.2.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 index 9f40f4f78..6c3d4b09f 100644 --- 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@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v3.2.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 index 818d6f0a1..896efc611 100644 --- 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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v3.2.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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/maven-update-pom-version@v3.2.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 index 0f3c4849e..0fc3998e3 100644 --- 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@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v3.2.1 with: java-version: ${{ inputs.java-version }} java-distribution: ${{ inputs.java-distribution }} @@ -107,11 +107,11 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v3.2.1 with: java-version: ${{ inputs.java-version }} java-distribution: ${{ inputs.java-distribution }} - - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v3.2.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 index 95e22150d..f2a7f8848 100644 --- 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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/calculate-next-internal-version@v3.2.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@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v3.2.1 with: new-version: ${{env.VERSION}} chart-dir: ${{ inputs.chart-dir }} - - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v3.2.1 with: username: ${{ secrets.BOT_GITHUB_USERNAME }} add-options: -u @@ -69,7 +69,7 @@ jobs: - name: Package Helm Chart id: package-helm-chart - uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v3.2.1 with: chart-dir: ${{ inputs.chart-dir }} @@ -77,7 +77,7 @@ jobs: run: git push origin $VERSION - name: Publish Helm chart - uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v3.2.0 + uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v3.2.1 with: helm-charts-repo: ${{ inputs.helm-charts-repo }} helm-charts-repo-branch: ${{ inputs.helm-charts-repo-branch }}