From 23e152623e7b7c5cc5ecaef5a3b4520a9c70611d Mon Sep 17 00:00:00 2001 From: Ray Plante Date: Mon, 29 Aug 2022 17:42:29 -0400 Subject: [PATCH 1/4] uprev metadata submodule to 2.0.0 --- metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata b/metadata index 1d55c2dc..ab1fc6dc 160000 --- a/metadata +++ b/metadata @@ -1 +1 @@ -Subproject commit 1d55c2dcb0cca9c826b2e09d463cd569f5e13213 +Subproject commit ab1fc6dc99e4980f72b80ff42ce53cd2f80a8270 From f85e547a69ddfcbd09a8f53bd241930d9cdee65d Mon Sep 17 00:00:00 2001 From: elmiomar Date: Fri, 28 Jun 2024 14:17:58 -0400 Subject: [PATCH 2/4] update jq dep to support arm64 --- metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata b/metadata index 99db4ed0..b43a1138 160000 --- a/metadata +++ b/metadata @@ -1 +1 @@ -Subproject commit 99db4ed04f0481620067489ee89ae29baef06697 +Subproject commit b43a11381c473ae68cdba1f9c539421988fa50d1 From 1e4c25d95e19eee09cb5df59a8831f2c2af14143 Mon Sep 17 00:00:00 2001 From: elmiomar Date: Fri, 28 Jun 2024 14:31:06 -0400 Subject: [PATCH 3/4] use jq instead of jqfromsrc --- docker/dockbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockbuild.sh b/docker/dockbuild.sh index 81e344f7..ed949167 100755 --- a/docker/dockbuild.sh +++ b/docker/dockbuild.sh @@ -23,7 +23,7 @@ PACKAGE_NAME=oar-pdr-py ## containers to be built. List them in dependency order (where a latter one ## depends the former ones). # -DEP_DOCKER_IMAGE_DIRS="pymongo jqfromsrc ejsonschema pyenv" +DEP_DOCKER_IMAGE_DIRS="pymongo jq ejsonschema pyenv" EXEC_DOCKER_IMAGE_DIRS="pdrpytest pdpserver midasserver peopleserver" [ -d "$codedir/metadata/docker" ] || { From 93ae80a2200b61b2f954bce4302fcf83804b7c22 Mon Sep 17 00:00:00 2001 From: RayPlante Date: Wed, 24 Jul 2024 15:57:50 -0400 Subject: [PATCH 4/4] align metadata submodule with integration before merge --- metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata b/metadata index b43a1138..9cab8808 160000 --- a/metadata +++ b/metadata @@ -1 +1 @@ -Subproject commit b43a11381c473ae68cdba1f9c539421988fa50d1 +Subproject commit 9cab8808a12e9de38b566da961e005a5c4fe3ca0