diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 6ee3c1237..589f5cb07 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -19,6 +19,8 @@ jobs: changed_files: ${{ steps.changed-files.outputs.all_changed_files }} steps: - uses: actions/checkout@v4 + - name: Configure git safe directory + run: git config --global --add safe.directory '*' - name: Get changed files id: changed-files uses: tj-actions/changed-files@v45 diff --git a/.github/workflows/lcm-pipeline.yaml b/.github/workflows/lcm-pipeline.yaml index b7b2aad87..245f35107 100644 --- a/.github/workflows/lcm-pipeline.yaml +++ b/.github/workflows/lcm-pipeline.yaml @@ -36,7 +36,6 @@ jobs: image_tag: ${{ steps.gen-image-tag.outputs.image_tag }} pipeline_identifier: ${{ github.run_id }} service_version: ${{ steps.read-version.outputs.service_version }} - service_major_version: ${{ steps.read-version.outputs.service_major_version }} steps: - uses: actions/checkout@v5 with: @@ -62,9 +61,6 @@ jobs: run: | version=$(cat VERSION | tr -d '\n') echo "service_version=$version" >> $GITHUB_OUTPUT - major=$(echo "$version" | cut -d. -f1) - echo "service_major_version=M$major" >> $GITHUB_OUTPUT - dockerfiles-validation: needs: [ prepare-build ] if: ${{ needs.prepare-build.outputs.images != '[]' && needs.prepare-build.outputs.images != '' }} @@ -134,7 +130,6 @@ jobs: ${{ needs.prepare-build.outputs.image_tag }} ${{ inputs.deploy && 'latest' || '' }} ${{ inputs.deploy && needs.prepare-build.outputs.service_version || '' }} - ${{ inputs.deploy && needs.prepare-build.outputs.service_major_version || '' }} build-context: ${{ steps.load-config.outputs.CONTAINER_CONTEXT }} container-file: ${{ steps.get-image-config.outputs.CONTAINER_FILE }} vault-url: '${{ secrets.VAULT_ADDRESS }}' @@ -285,37 +280,41 @@ jobs: with: images: ${{ needs.prepare-build.outputs.images }} charts: ${{ needs.build-helmreleases.outputs.built_charts || '{}' }} - image_tag: ${{ needs.prepare-build.outputs.service_major_version }} + image_tag: ${{ needs.prepare-build.outputs.service_version }} secrets: inherit - register-bricks-prod: + notify-image-available: runs-on: group: infra1-runners-arc labels: runners-small needs: [ prepare-build, promote-to-stable ] + permissions: + pull-requests: write if: | !cancelled() && !contains(needs.*.result, 'failure') && needs.prepare-build.outputs.images != '[]' && needs.prepare-build.outputs.images != '' && inputs.deploy - strategy: - matrix: - cluster: [ na1, ca2, perf1, bom1, syd1, na3, eu1, fra1 ] steps: - - name: Checkout repository - uses: actions/checkout@v5 - - name: Register bricks to ${{ matrix.cluster }} - uses: ./.github/actions/rundeck - with: - server: '${{ secrets.RUNDECK_URL }}' - project: ${{ matrix.cluster }}-ansible - job-group: ansible/msf/hotfix - job-name: ${{ matrix.cluster }}_lcm_pipeline_component_tool - vault-url: ${{ secrets.VAULT_ADDRESS }} + - name: Comment on PR + run: | + gh pr comment ${{ inputs.pr_number }} \ + --repo ${{ github.repository }} \ + --body "## LCM bricks image available + + New image \`stable/lcm-bricks\` available and tagged for all prod clusters. + Please, manually run the respective rundeck job for each: ${{ secrets.RUNDECK_URL }} + + | | | + |---|---| + | **Version** | \`${{ needs.prepare-build.outputs.service_version }}\` | + | **Build tag** | \`${{ needs.prepare-build.outputs.image_tag }}\` |" + env: + GH_TOKEN: ${{ secrets.TOKEN_GITHUB_YENKINS }} create-auto-merge-prod-pr: - needs: [ prepare-build, build-helmreleases, register-bricks-prod ] + needs: [ prepare-build, build-helmreleases ] if: | !cancelled() && !contains(needs.*.result, 'failure') && @@ -335,7 +334,7 @@ jobs: secrets: inherit create-manual-merge-prod-pr: - needs: [ prepare-build, build-helmreleases, register-bricks-prod ] + needs: [ prepare-build, build-helmreleases ] if: | !cancelled() && !contains(needs.*.result, 'failure') && diff --git a/VERSION b/VERSION index 80fd26f37..f46ce326f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.105 +3.7.106 diff --git a/gooddata.gemspec b/gooddata.gemspec index 5bd3bdc2b..c46f46155 100644 --- a/gooddata.gemspec +++ b/gooddata.gemspec @@ -78,6 +78,7 @@ Gem::Specification.new do |s| if RUBY_VERSION >= '2.8' s.add_dependency 'activesupport', '>= 6.0.3.1' + s.add_dependency 'i18n', '< 1.15' elsif RUBY_VERSION >= '2.5' s.add_dependency 'activesupport', '< 7.0.0' else