add date to version apt package name

qdrvm · Jun 24, 2024 · e1ab5dc · e1ab5dc
1 parent a797b26
commit e1ab5dc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/zombie-tests.yaml b/.github/workflows/zombie-tests.yaml
@@ -60,7 +60,7 @@ jobs:
           ARTIFACTS_REPO=$(grep '^ARTIFACTS_REPO ?=' Makefile | sed 's/ARTIFACTS_REPO ?= //')
           REGION=$(grep '^REGION ?=' Makefile | sed 's/REGION ?= //')
           SHORT_COMMIT_HASH=$(grep 'short_commit_hash:' commit_hash.txt | cut -d ' ' -f 2)
-          PACKAGE_VERSION="${SHORT_COMMIT_HASH}-${{ github.event.inputs.build_type }}"
+          PACKAGE_VERSION="$(date +'%d.%m.%y')-${SHORT_COMMIT_HASH}-${{ github.event.inputs.build_type }}"
           echo "PACKAGE_VERSION=${PACKAGE_VERSION}"
           echo "package_version=${PACKAGE_VERSION}" >> $GITHUB_ENV
           gcloud config set artifacts/repository $ARTIFACTS_REPO

diff --git a/housekeeping/docker/kagome-dev/Makefile b/housekeeping/docker/kagome-dev/Makefile
@@ -88,7 +88,7 @@ kagome_dev_docker_build:
 		cp /opt/kagome/$(BUILD_DIR)/node/kagome /tmp/kagome/kagome && \
 		cd /opt/kagome/housekeeping/docker/kagome-dev && \
 		./build_apt_package.sh \
-			\"$${SHORT_COMMIT_HASH}-$${BUILD_TYPE}\" \
+			\"$$(date +'%d.%m.%y')-$${SHORT_COMMIT_HASH}-$${BUILD_TYPE}\" \
 			$(PACKAGE_ARCHITECTURE) \
 			kagome-dev \
 			/tmp/kagome \
@@ -106,4 +106,4 @@ upload_apt_package:
 	SHORT_COMMIT_HASH=$$(grep 'short_commit_hash:' commit_hash.txt | cut -d ' ' -f 2); \
 	gcloud config set artifacts/repository $(ARTIFACTS_REPO); \
 	gcloud config set artifacts/location $(REGION); \
-	gcloud artifacts apt upload $(ARTIFACTS_REPO) --source=./pkg/kagome-dev_$${SHORT_COMMIT_HASH}-$${BUILD_TYPE}_$(PACKAGE_ARCHITECTURE).deb
+	gcloud artifacts apt upload $(ARTIFACTS_REPO) --source=./pkg/kagome-dev_$$(date +'%d.%m.%y')-$${SHORT_COMMIT_HASH}-$${BUILD_TYPE}_$(PACKAGE_ARCHITECTURE).deb
diff --git a/zombienet/docker/Makefile b/zombienet/docker/Makefile
@@ -48,7 +48,7 @@ POLKADOT_RELEASE_GLOBAL ?= v0.9.42
 define run_test
 	@CONTAINER_NAME=$$(openssl rand -hex 6); \
 	echo "Running test in container $$CONTAINER_NAME with params image:$(1), test:$(2)"; \
-	docker run --name $$CONTAINER_NAME --platform linux/amd64 $(1) zombienet-linux-x64 test -p native $(2); \
+	docker run --name $$CONTAINER_NAME --platform linux/amd64 $(1) "zombienet-linux-x64 test -p native $(2)"; \
 	TEST_EXIT_CODE=$$(docker inspect $$CONTAINER_NAME --format='{{.State.ExitCode}}'); \
 	if [ "$(COPY_LOGS_TO_HOST)" = "true" ]; then \
 		$(MAKE) copy_logs_to_host CONTAINER_NAME=$$CONTAINER_NAME; \