From c31e29c0b3c576570c423c921a94d3bffb14e456 Mon Sep 17 00:00:00 2001
From: Kirill Azovtsev <zak@zergling.ru>
Date: Mon, 27 Jan 2025 00:52:03 +0300
Subject: [PATCH] CI - checkout with master fix

---
 .github/workflows/zombie-builder.yml           | 14 ++++++++++----
 zombienet/docker/Makefile.include/polkadot.mk  |  8 ++++----
 zombienet/docker/Makefile.include/variables.mk |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/zombie-builder.yml b/.github/workflows/zombie-builder.yml
index f93a4619b4..067e270f59 100644
--- a/.github/workflows/zombie-builder.yml
+++ b/.github/workflows/zombie-builder.yml
@@ -21,7 +21,7 @@ on:
       polkadot_builder:
         description: 'Build the polkadot builder image'
         required: false
-        default: false
+        default: 'false'
         type: 'boolean'
       polkadot_builder_tag:
         description: 'Custom Polkadot Builder tag'
@@ -31,7 +31,7 @@ on:
       polkadot_binaries:
         description: 'Build the polkadot binaries'
         required: false
-        default: true
+        default: 'true'
         type: 'boolean'
       polkadot_sdk_tag:
         description: 'Custom Polkadot SDK tag'
@@ -72,7 +72,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        
+        with:
+          fetch-depth: 0
+
+      - name: Fetch master branch
+        run: git fetch origin master:master
+             
       - name : "Authenticate with Google Cloud"
         uses: 'google-github-actions/auth@v2'
         with:
@@ -92,11 +97,12 @@ jobs:
         run: |
           make set_versions
           exists=$(make polkadot_builder_check_tag)
+          echo "Image Exists: $exists"
           echo "exists=$exists" >> $GITHUB_ENV
 
       - name: "Build Polkadot Builder"
         working-directory: ./zombienet/docker
-        if: env.exists == 'false' || github.event.inputs.polkadot_builder == true
+        if: env.exists == 'false' || github.event.inputs.polkadot_builder == 'true'
         run: make polkadot_builder_all_arch 
         
       - name: "Versions Info"
diff --git a/zombienet/docker/Makefile.include/polkadot.mk b/zombienet/docker/Makefile.include/polkadot.mk
index 10cb138b6f..2654e44548 100644
--- a/zombienet/docker/Makefile.include/polkadot.mk
+++ b/zombienet/docker/Makefile.include/polkadot.mk
@@ -21,10 +21,10 @@ polkadot_builder_push_manifest:
 	docker manifest push $(DOCKER_REGISTRY_PATH)polkadot_builder:$(BUILDER_LATEST_TAG)
 
 polkadot_builder_all_arch: set_versions
-	$(MAKE) polkadot_builder PLATFORM=linux/amd64 ARCHITECTURE=amd64 ; \
-	$(MAKE) polkadot_builder_push PLATFORM=linux/amd64 ARCHITECTURE=amd64 ; \
-	$(MAKE) polkadot_builder PLATFORM=linux/arm64 ARCHITECTURE=arm64 ; \
-	$(MAKE) polkadot_builder_push PLATFORM=linux/arm64 ARCHITECTURE=arm64 ; \
+	$(MAKE) polkadot_builder PLATFORM=linux/amd64 ARCHITECTURE=amd64 && \
+	$(MAKE) polkadot_builder_push PLATFORM=linux/amd64 ARCHITECTURE=amd64 && \
+	$(MAKE) polkadot_builder PLATFORM=linux/arm64 ARCHITECTURE=arm64 && \
+	$(MAKE) polkadot_builder_push PLATFORM=linux/arm64 ARCHITECTURE=arm64 && \
 	$(MAKE) polkadot_builder_push_manifest
 
 polkadot_builder_image_info: set_versions
diff --git a/zombienet/docker/Makefile.include/variables.mk b/zombienet/docker/Makefile.include/variables.mk
index 70e83ec1ee..64aa9029da 100644
--- a/zombienet/docker/Makefile.include/variables.mk
+++ b/zombienet/docker/Makefile.include/variables.mk
@@ -63,7 +63,7 @@ KAGOME_PACKAGE_VERSION ?=
 WORKING_DIR := $(shell pwd)/../../../kagome
 DELETE_IMAGE_AFTER_TEST ?= true
 
-CURRENT_DATE := $(shell date +"%Y%m%d")
+CURRENT_DATE := $(shell TZ=UTC-3 date +"%Y%m%d")
 
 export DOCKER_BUILDKIT=1
 # BUILDKIT_PROGRESS - auto, plain, tty, rawjson