From 994da1303b3afe578d5cab3b1574cb2b29e3dc75 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Fri, 21 Mar 2025 16:02:56 +0100
Subject: [PATCH] Updated hive reference to get version supporting Python 3.12
and U24.04
---
.gitlab-ci.yml | 16 ++++++----------
hive | 2 +-
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5daaec37..c55845f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ stages:
- tests
- beekeepy
+
+
workflow:
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
@@ -23,24 +25,18 @@ variables:
BLOCK_LOG_SOURCE_DIR_5M: /blockchain/block_log_5m
BLOCK_LOG_SOURCE_DIR_MIRRORNET_5M: /blockchain/block_log_5m_mirrornet
- # uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-10
- CI_BASE_IMAGE_TAG: "@sha256:080b16fd53013aeb9b89b00a8dfc90fecf886173f46448b05f45cee376c43330"
- CI_BASE_IMAGE: "registry.gitlab.syncad.com/hive/hive/ci-base-image${CI_BASE_IMAGE_TAG}"
-
BEEKEEPY_DIR: ${CI_PROJECT_DIR}/beekeepy
LOCAL_TOOLS_DIR: ${CI_PROJECT_DIR}/tests/local-tools
include:
- project: 'hive/hive'
# This has to be the same as the commit checked out in the submodule
- ref: ed702f86d3a1ae567b2d2e1d0d7240a187223964
+ ref: 2f66491fa87527714829792959fce84cd94ecde3
file: '/scripts/ci-helpers/prepare_data_image_job.yml'
- - project: 'hive/common-ci-configuration'
- # This should be the same version of Common CI defined in /hive/scripts/ci-helpers/prepare_data_image_job.yml
- ref: 682ba2e16cfc4ef192478d2d21c4b5a52bbd4678
- file: '/templates/python_projects.gitlab-ci.yml'
+ # DO NOT include ccc here. It will be indirectly included by above yaml file.
+ #- project: 'hive/common-ci-configuration'
-image: ${CI_BASE_IMAGE}
+image: ${PYTHON_IMAGE}
default:
tags:
diff --git a/hive b/hive
index ed702f86..2f66491f 160000
--- a/hive
+++ b/hive
@@ -1 +1 @@
-Subproject commit ed702f86d3a1ae567b2d2e1d0d7240a187223964
+Subproject commit 2f66491fa87527714829792959fce84cd94ecde3
--
GitLab