From 984f1c977f301069f2af4abadec6d734f7c04c22 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Thu, 20 Mar 2025 19:02:29 +0100
Subject: [PATCH] Hive submodule updated to the one supporting U24.04
---
.gitlab-ci.yml | 14 ++++----------
hive | 2 +-
ts/npm-common-config | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e8dbdda5..8b037921f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,18 +5,12 @@ stages:
- deploy
include:
- - project: 'hive/common-ci-configuration'
- ref: 590bfd88a491efba5a39571bc2c82ffbabda2ec8
- file:
- - '/templates/npm_projects.gitlab-ci.yml'
- - '/templates/wasm_build.gitlab-ci.yml'
- - '/templates/python_projects.gitlab-ci.yml'
- - '/templates/test_jobs.gitlab-ci.yml'
- - '/templates/docker_image_jobs.gitlab-ci.yml'
- - '/templates/cache_cleanup.gitlab-ci.yml'
- project: 'hive/hive'
- ref: 824b7c295687c50a49e412aceb7a14f834927a1e # develop
+ # This has to be the same as the commit checked out in the submodule
+ ref: 2f66491fa87527714829792959fce84cd94ecde3
file: '/scripts/ci-helpers/prepare_data_image_job.yml'
+ # DO NOT include ccc here. It will be indirectly included by above yaml file.
+ #- project: 'hive/common-ci-configuration'
variables:
GIT_DEPTH: 0
diff --git a/hive b/hive
index 824b7c295..2f66491fa 160000
--- a/hive
+++ b/hive
@@ -1 +1 @@
-Subproject commit 824b7c295687c50a49e412aceb7a14f834927a1e
+Subproject commit 2f66491fa87527714829792959fce84cd94ecde3
diff --git a/ts/npm-common-config b/ts/npm-common-config
index 590bfd88a..fccc10fc5 160000
--- a/ts/npm-common-config
+++ b/ts/npm-common-config
@@ -1 +1 @@
-Subproject commit 590bfd88a491efba5a39571bc2c82ffbabda2ec8
+Subproject commit fccc10fc5c8b847d82ca7446c957caa49a7440f6
--
GitLab