From 2b8d31844edae5fdea4c9f53a821d9c1763d3990 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 8 Sep 2020 18:58:30 +0300 Subject: [PATCH 1/4] Update CI.yml --- .github/workflows/CI.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3382820c0..d95555ad4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,6 +25,7 @@ jobs: env: LATEST_BRANCH: "${{ github.event.repository.master_branch }}" DOCKER_REPOSITORY: "zabbix" + PUSH_IMAGES: "false" strategy: fail-fast: false matrix: @@ -108,7 +109,7 @@ jobs: GIT_BRANCH="${{ github.ref }}" GIT_BRANCH=${GIT_BRANCH:11} - echo "::warning Branch - ${GIT_BRANCH}" + echo "::debug::Branch - ${GIT_BRANCH}" if [ "${GIT_BRANCH}" == "trunk" ]; then TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${GIT_BRANCH}") @@ -126,7 +127,7 @@ jobs: TAGS=$(printf -- "--tag %s " "${TAGS_ARRAY[@]}") - echo "::warning Tags - ${TAGS}" + echo "::debug::Tags - ${TAGS}" echo ::set-output name=image_name::${IMAGE_NAME} echo ::set-output name=image_tag_versions::$(printf -- "|%s" "${TAGS_ARRAY[@]}") @@ -147,7 +148,7 @@ jobs: RELEASE_VERSION=${RELEASE_VERSION:10} GIT_BRANCH=${RELEASE_VERSION%.*} - echo "::warning Release version ${RELEASE_VERSION}. Branch ${GIT_BRANCH}" + echo "::debug::Release version ${RELEASE_VERSION}. Branch ${GIT_BRANCH}" TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${RELEASE_VERSION}") @@ -196,22 +197,24 @@ jobs: elif [ ! -z "${{ steps.prepare_release.outputs.buildx_args }}" ]; then BUILDX_ARGS="${{ steps.prepare_release.outputs.buildx_args }}" fi + + echo "::debug::push built images - ${{ env.PUSH_IMAGES }}" docker buildx build --cache-from "type=local,src=/tmp/.buildx-cache" \ - --output "type=image,push=true" \ + --output "type=image,push=false" \ ${BUILDX_ARGS} - name: Inspect images run: | - echo "::warning push - ${{ steps.prepare_push.outputs.buildx_args }}" - echo "::warning release - ${{ steps.prepare_release.outputs.buildx_args }}" + echo "::debug::push - ${{ steps.prepare_push.outputs.buildx_args }}" + echo "::debug::release - ${{ steps.prepare_release.outputs.buildx_args }}" if [ ! -z "${{ steps.prepare_push.outputs.image_tag_versions }}" ]; then IMAGE_TAG_VERSIONS="${{ steps.prepare_push.outputs.image_tag_versions }}" - echo "::warning tags push raw - $IMAGE_TAG_VERSIONS" + echo "::debug::tags push raw - $IMAGE_TAG_VERSIONS" elif [ ! -z "${{ steps.prepare_release.outputs.image_tag_versions }}" ]; then IMAGE_TAG_VERSIONS="${{ steps.prepare_release.outputs.image_tag_versions }}" - echo "::warning tags release raw - $IMAGE_TAG_VERSIONS" + echo "::debug::tags release raw - $IMAGE_TAG_VERSIONS" fi IMAGE_TAG_VERSIONS=${IMAGE_TAG_VERSIONS%%+(|)} From 9b302b48b5419fecc13b61111d2f040868f03a87 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 8 Sep 2020 19:13:04 +0300 Subject: [PATCH 2/4] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d95555ad4..87c1153f1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -138,7 +138,7 @@ jobs: --file ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile ./${{ matrix.build }}/${{ matrix.os }} - name: Prepare environment (release) - if: github.event_name == 'release' && github.event.action == 'created' + if: github.event_name == 'release' && github.event.action == 'published' id: prepare_release run: | TAGS_ARRAY=() From c4bd6cefe79c9572706e636aded24c69a27c5c87 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 8 Sep 2020 19:31:18 +0300 Subject: [PATCH 3/4] Update CI.yml --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 87c1153f1..f0190c3c4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,7 @@ defaults: jobs: build: env: - LATEST_BRANCH: "${{ github.event.repository.master_branch }}" + LATEST_BRANCH: "${{ github.event.repository.default_branch }}" DOCKER_REPOSITORY: "zabbix" PUSH_IMAGES: "false" strategy: @@ -174,6 +174,8 @@ jobs: BUILDX_ARGS="${{ steps.prepare_push.outputs.buildx_args }}" elif [ ! -z "${{ steps.prepare_release.outputs.buildx_args }}" ]; then BUILDX_ARGS="${{ steps.prepare_release.outputs.buildx_args }}" + else + exit 1 fi docker buildx build --cache-to "type=local,dest=/tmp/.buildx-cache" \ @@ -197,11 +199,9 @@ jobs: elif [ ! -z "${{ steps.prepare_release.outputs.buildx_args }}" ]; then BUILDX_ARGS="${{ steps.prepare_release.outputs.buildx_args }}" fi - - echo "::debug::push built images - ${{ env.PUSH_IMAGES }}" docker buildx build --cache-from "type=local,src=/tmp/.buildx-cache" \ - --output "type=image,push=false" \ + --output "type=image,push=${{ env.PUSH_IMAGES }}" \ ${BUILDX_ARGS} - name: Inspect images From a86c08b55bc9c4086dd0e5150d87123911c92d05 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 8 Sep 2020 20:42:06 +0300 Subject: [PATCH 4/4] Update CI.yml --- .github/workflows/CI.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f0190c3c4..6f573fbc6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,10 +6,10 @@ on: - published push: branches: - - 3.0 - - 4.0 - - 5.0 - - trunk + - '3.0' + - '4.0' + - '5.0' + - 'trunk' paths-ignore: - '.env*' - 'docker-compose*.yaml' @@ -25,7 +25,6 @@ jobs: env: LATEST_BRANCH: "${{ github.event.repository.default_branch }}" DOCKER_REPOSITORY: "zabbix" - PUSH_IMAGES: "false" strategy: fail-fast: false matrix: @@ -201,7 +200,7 @@ jobs: fi docker buildx build --cache-from "type=local,src=/tmp/.buildx-cache" \ - --output "type=image,push=${{ env.PUSH_IMAGES }}" \ + --output "type=image,push=${{ secrets.AUTO_PUSH_IMAGES }}" \ ${BUILDX_ARGS} - name: Inspect images