Merge various changes with Zabbix 7.2 branch

This commit is contained in:
Alexey Pustovalov
2024-12-25 01:29:57 +09:00
parent 8257994171
commit 11fbb299b5
11 changed files with 7 additions and 16 deletions

View File

@ -645,8 +645,8 @@ jobs:
with:
context: ${{ format('{0}/{1}/{2}/', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
build-contexts: |
config_templates=./config_templates/
sources=./sources/
config_templates=./config_templates/
file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
platforms: ${{ steps.platform.outputs.list }}
push: true

View File

@ -412,8 +412,8 @@ jobs:
build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }}
extra-args: |
--iidfile=${{ github.workspace }}/iidfile
--build-context config_templates=./config_templates/
--build-context sources=./sources/
--build-context config_templates=./config_templates/
- name: Prepare image metadata
id: image_metadata

View File

@ -13,7 +13,7 @@ on:
- cron: '39 3 * * 2'
push:
branches:
- '7.0'
- '7.2'
# Declare default permissions as read only.
permissions: read-all

View File

@ -30,9 +30,9 @@ name: SonarCloud analysis
on:
push:
branches: [ "7.0" ]
branches: [ "7.2" ]
pull_request:
branches: [ "7.0" ]
branches: [ "7.2" ]
workflow_dispatch:
permissions: