update dependencies for packet

qdrvm · Jun 23, 2024 · cb1df90 · cb1df90
1 parent ae589ca
commit cb1df90
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 53 deletions.
diff --git a/.github/workflows/zombie-tests.yaml b/.github/workflows/zombie-tests.yaml
@@ -8,6 +8,16 @@ name: Zombie-Tests
 
 on:
   workflow_dispatch:
+    inputs:
+      build_type:
+        description: 'Build type'
+        required: true
+        default: 'Release'
+        type: 'choice'
+        options:
+          - Release
+          - Debug
+          - ReleaseWithDebInfo
 
 env:
   DOCKER_REGISTRY_PATH: ${{ secrets.GCP_REGISTRY }}/${{ secrets.GCP_PROJECT }}/kagome-dev/
@@ -31,8 +41,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ env.CACHE_PATH }}
-          key: ${{ github.job }}-${{ env.CACHE_VERSION }}
-          save-always: true
+          key: ${{ github.job }}-${{ env.CACHE_VERSION }}-${{ github.event.inputs.build_type }}
+          #save-always: true
 
       - name: "Authenticate with Google Cloud"
         uses: 'google-github-actions/auth@v2'
@@ -68,14 +78,16 @@ jobs:
         run: make kagome_dev_docker_build \
           DOCKER_REGISTRY_PATH=${DOCKER_REGISTRY_PATH} \
           GITHUB_HUNTER_USERNAME=${{ secrets.HUNTER_USERNAME }} \
-          GITHUB_HUNTER_TOKEN=${{ secrets.HUNTER_TOKEN }}
+          GITHUB_HUNTER_TOKEN=${{ secrets.HUNTER_TOKEN }} \
+          BUILD_TYPE=${{ github.event.inputs.build_type }}
 
       - name: "Push Polkadot APT Package"
         #if: github.event.inputs.polkadot_binaries_rebuild == 'true'
         working-directory: ./housekeeping/docker/kagome-dev
         run: |
           SHORT_COMMIT_HASH=$(grep 'short_commit_hash:' commit_hash.txt | cut -d ' ' -f 2)
-          make upload_apt_package
+          make upload_apt_package \
+          BUILD_TYPE=${{ github.event.inputs.build_type }}
 
   
 #  Prepare-Kagome-Docker:

diff --git a/housekeeping/docker/kagome-dev/Makefile b/housekeeping/docker/kagome-dev/Makefile
@@ -16,6 +16,8 @@ MINIDEB_HASH := $(subst bitnami/minideb@sha256:,,$(MINIDEB_IMAGE))
 MINIDEB_SHORT_HASH := $(shell echo $(MINIDEB_HASH) | cut -c1-7)
 MINIDEB_TAG = $(MINIDEB_SHORT_HASH)_rust-$(RUST_VERSION)
 
+DEPENDENCIES ?= libstdc++6, zlib1g, libgcc-s1, libc6, libtinfo6, libseccomp2, libatomic1
+
 GITHUB_HUNTER_USERNAME ?=
 GITHUB_HUNTER_TOKEN ?=
 CTEST_OUTPUT_ON_FAILURE ?= 1
@@ -54,55 +56,44 @@ kagome_dev_docker_build:
 	SHORT_COMMIT_HASH=$$(grep 'short_commit_hash:' commit_hash.txt | cut -d ' ' -f 2); \
 	BUILD_THREADS=$$(nproc 2>/dev/null || sysctl -n hw.ncpu); \
 	DOCKER_EXEC_RESULT=0 ; \
-	if [ "$(BUILD_TYPE)" = "Release" ]; then \
-	  	echo "debug"; \
-		docker run -d --name $$CONTAINER_NAME \
-			--platform $(PLATFORM) \
-			--entrypoint "/bin/bash" \
-			-e SHORT_COMMIT_HASH=$$SHORT_COMMIT_HASH \
-			-e BUILD_TYPE=$(BUILD_TYPE) \
-			-e BUILD_THREADS=$$BUILD_THREADS \
-			-e PACKAGE_ARCHITECTURE=$(PACKAGE_ARCHITECTURE) \
-			-e GITHUB_HUNTER_USERNAME=$(GITHUB_HUNTER_USERNAME) \
-			-e GITHUB_HUNTER_TOKEN=$(GITHUB_HUNTER_TOKEN) \
-			-e CTEST_OUTPUT_ON_FAILURE=$(CTEST_OUTPUT_ON_FAILURE) \
-			-v $$(pwd)/../../../../kagome:/opt/kagome \
-			-v $(GOOGLE_APPLICATION_CREDENTIALS):/root/.gcp/google_creds.json \
-			-v $(CACHE_DIR)/.cargo:/root/.cargo \
-			-v $(CACHE_DIR)/.hunter:/root/.hunter \
-			-v $(CACHE_DIR)/.cache/ccache:/root/.cache/ccache \
-			-v $(CACHE_DIR)/.rustup:/root/.rustup \
-			$(DOCKER_REGISTRY_PATH)kagome_builder_deb:$(MINIDEB_TAG) \
-			-c "tail -f /dev/null"; \
-		docker exec -t $$CONTAINER_NAME /bin/bash -c \
-			"cd /opt/kagome && \
-			git config --global --add safe.directory /opt/kagome && \
-			source /venv/bin/activate && \
-			git submodule update --init && \
-			echo \"Building in $(pwd)\" && \
-			cmake . -B\"$(BUILD_DIR)\" -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=\"${BUILD_TYPE}\" -DBACKWARD=OFF && \
-            cmake --build \"$(BUILD_DIR)\" --target kagome -- -j${BUILD_THREADS} && \
-            mkdir -p /tmp/kagome && \
-            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}\" \
-            	$(PACKAGE_ARCHITECTURE) \
-            	kagome-dev \
-            	/tmp/kagome \
-            	'Kagome Dev Debian Package' \
-            	'libstdc++6, zlib1g, libgcc-s1, libc6' ; \
-            " || DOCKER_EXEC_RESULT=$$? ; \
-	elif [ "$(BUILD_TYPE)" = "Debug" ]; then \
-		echo "Debug"; \
-		BUILD_THREADS=1 ; \
-	elif [ "$(BUILD_TYPE)" = "RelWithDebInfo" ]; then \
-		echo "RelWithDebInfo"; \
-		BUILD_THREADS=2 ; \
-	else \
-		echo "Invalid BUILD_TYPE"; \
-		exit 1; \
-	fi ; \
+	echo "Build type: $(BUILD_TYPE)"; \
+	docker run -d --name $$CONTAINER_NAME \
+		--platform $(PLATFORM) \
+		--entrypoint "/bin/bash" \
+		-e SHORT_COMMIT_HASH=$$SHORT_COMMIT_HASH \
+		-e BUILD_TYPE=$(BUILD_TYPE) \
+		-e BUILD_THREADS=$$BUILD_THREADS \
+		-e PACKAGE_ARCHITECTURE=$(PACKAGE_ARCHITECTURE) \
+		-e GITHUB_HUNTER_USERNAME=$(GITHUB_HUNTER_USERNAME) \
+		-e GITHUB_HUNTER_TOKEN=$(GITHUB_HUNTER_TOKEN) \
+		-e CTEST_OUTPUT_ON_FAILURE=$(CTEST_OUTPUT_ON_FAILURE) \
+		-v $$(pwd)/../../../../kagome:/opt/kagome \
+		-v $(GOOGLE_APPLICATION_CREDENTIALS):/root/.gcp/google_creds.json \
+		-v $(CACHE_DIR)/.cargo:/root/.cargo \
+		-v $(CACHE_DIR)/.hunter:/root/.hunter \
+		-v $(CACHE_DIR)/.cache/ccache:/root/.cache/ccache \
+		-v $(CACHE_DIR)/.rustup:/root/.rustup \
+		$(DOCKER_REGISTRY_PATH)kagome_builder_deb:$(MINIDEB_TAG) \
+		-c "tail -f /dev/null"; \
+	docker exec -t $$CONTAINER_NAME /bin/bash -c \
+		"cd /opt/kagome && \
+		git config --global --add safe.directory /opt/kagome && \
+		source /venv/bin/activate && \
+		git submodule update --init && \
+		echo \"Building in $(pwd)\" && \
+		cmake . -B\"$(BUILD_DIR)\" -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=\"${BUILD_TYPE}\" -DBACKWARD=OFF && \
+		cmake --build \"$(BUILD_DIR)\" --target kagome -- -j${BUILD_THREADS} && \
+		mkdir -p /tmp/kagome && \
+		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}\" \
+			$(PACKAGE_ARCHITECTURE) \
+			kagome-dev \
+			/tmp/kagome \
+			'Kagome Dev Debian Package' \
+			'$(DEPENDENCIES)' ; \
+		" || DOCKER_EXEC_RESULT=$$? ; \
 	if [ $$DOCKER_EXEC_RESULT -ne 0 ]; then \
 		echo "Error: Docker exec failed with return code $$DOCKER_EXEC_RESULT"; \
 		docker stop $$CONTAINER_NAME; \