diff --git a/.argo/release.yaml b/.argo/release.yaml index a467f158..7a373d47 100644 --- a/.argo/release.yaml +++ b/.argo/release.yaml @@ -132,7 +132,7 @@ spec: - name: gitUrlNoProtocol value: '{{workflow.parameters.gitUrlNoProtocol}}' - name: commitMessage - value: "[skip ci] [CI SKIP] setting {{workflow.parameters.appName}} {{workflow.parameters.environment}} to chart version {{steps.get-updated-chart-version.outputs.result}}\n\nskip-checks:true" + value: "setting {{workflow.parameters.appName}} {{workflow.parameters.environment}} to chart version {{steps.get-updated-chart-version.outputs.result}}" - - name: set-environment-version templateRef: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 8e0d154e..61f92387 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -34,6 +34,13 @@ jobs: - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 + # No matter how we try ski ci options from GitHub it doesn't work + - name: Temporarily disable docs branch protections + uses: benjefferies/branch-protection-bot@master + with: + access_token: ${{ secrets.ACCESS_TOKEN }} + branch: ${{ github.event.repository.default_branch }} + # todo need to look repositoryGitURL, this needs to be overrideable from here and respected on the template side for both repositories - name: Deploy docs on production run: | @@ -50,3 +57,9 @@ jobs: -p shortSha="${GITHUB_SHA_SHORT}" \ --wait --log + - name: Enable back docs branch protection + uses: benjefferies/branch-protection-bot@master + if: always() # Force to always run this step to ensure the protection is always turned back on no matetr if previous step fail + with: + access_token: ${{ secrets.ACCESS_TOKEN }} + branch: ${{ github.event.repository.default_branch }} diff --git a/charts/docs/Chart.yaml b/charts/docs/Chart.yaml index 36b3080c..95851b36 100644 --- a/charts/docs/Chart.yaml +++ b/charts/docs/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 533ba6f description: Kubefirst documentation Helm chart name: docs type: application -version: 0.23.0 +version: 0.25.0