From ebc3d0e096b2aef92a41fb403a83c19bbeb49cb8 Mon Sep 17 00:00:00 2001 From: pipeacosta Date: Wed, 8 May 2024 16:40:06 +0200 Subject: [PATCH 1/3] Updated VILLASnode version in Dockerfiles Signed-off-by: pipeacosta --- packaging/Docker/Dockerfile.dev | 2 +- packaging/Docker/Dockerfile.dev-debian | 2 +- packaging/Docker/Dockerfile.manylinux | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/Docker/Dockerfile.dev b/packaging/Docker/Dockerfile.dev index e793b4b874..4eb81ea9ed 100644 --- a/packaging/Docker/Dockerfile.dev +++ b/packaging/Docker/Dockerfile.dev @@ -1,7 +1,7 @@ FROM fedora:36 AS base ARG CIM_VERSION=CGMES_2.4.15_16FEB2016 -ARG VILLAS_VERSION=5185c25ba7442c3e9264f4225f9a46829956732c +ARG VILLAS_VERSION=66569cf9c43d2d7a4626b9a84321c4e340d3fe18 ARG CMAKE_OPTS ARG MAKE_OPTS=-j4 diff --git a/packaging/Docker/Dockerfile.dev-debian b/packaging/Docker/Dockerfile.dev-debian index 03b671b828..46dff10309 100644 --- a/packaging/Docker/Dockerfile.dev-debian +++ b/packaging/Docker/Dockerfile.dev-debian @@ -1,7 +1,7 @@ FROM debian:11 ARG CIM_VERSION=CGMES_2.4.15_16FEB2016 -ARG VILLAS_VERSION=c976cd62d8c6667a078be0785ca3e623a05f7456 +ARG VILLAS_VERSION=66569cf9c43d2d7a4626b9a84321c4e340d3fe18 ARG CMAKE_OPTS ARG MAKE_OPTS=-j4 diff --git a/packaging/Docker/Dockerfile.manylinux b/packaging/Docker/Dockerfile.manylinux index 9fe896db07..3c01732aa0 100644 --- a/packaging/Docker/Dockerfile.manylinux +++ b/packaging/Docker/Dockerfile.manylinux @@ -6,7 +6,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64 ARG CIM_VERSION=CGMES_2.4.15_16FEB2016 -ARG VILLAS_VERSION=5185c25ba7442c3e9264f4225f9a46829956732c +ARG VILLAS_VERSION=566569cf9c43d2d7a4626b9a84321c4e340d3fe18 ARG CMAKE_OPTS ARG MAKE_OPTS=-j4 From 0b79e91c8f1afb5ae00189a79f175a484b87541d Mon Sep 17 00:00:00 2001 From: pipeacosta Date: Wed, 8 May 2024 17:08:29 +0200 Subject: [PATCH 2/3] Update VILLASnode version in Dockerfile.manylinux Signed-off-by: pipeacosta --- packaging/Docker/Dockerfile.manylinux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/Docker/Dockerfile.manylinux b/packaging/Docker/Dockerfile.manylinux index 3c01732aa0..756b7d8cd9 100644 --- a/packaging/Docker/Dockerfile.manylinux +++ b/packaging/Docker/Dockerfile.manylinux @@ -6,7 +6,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64 ARG CIM_VERSION=CGMES_2.4.15_16FEB2016 -ARG VILLAS_VERSION=566569cf9c43d2d7a4626b9a84321c4e340d3fe18 +ARG VILLAS_VERSION=66569cf9c43d2d7a4626b9a84321c4e340d3fe18 ARG CMAKE_OPTS ARG MAKE_OPTS=-j4 From 421fa843090976ac80b34be324d22f9ebf0391ff Mon Sep 17 00:00:00 2001 From: pipeacosta Date: Sun, 19 May 2024 15:14:44 +0200 Subject: [PATCH 3/3] Update VILLASnode version in shell scripts Signed-off-by: pipeacosta --- packaging/Shell/install-fedora-deps-dev.sh | 2 +- packaging/Shell/install-fedora-deps.sh | 2 +- packaging/Shell/install-ubuntu-deps.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/Shell/install-fedora-deps-dev.sh b/packaging/Shell/install-fedora-deps-dev.sh index 8fc1157298..1bf74946c8 100644 --- a/packaging/Shell/install-fedora-deps-dev.sh +++ b/packaging/Shell/install-fedora-deps-dev.sh @@ -1,7 +1,7 @@ #!/bin/bash CIM_VERSION=${CIM_VERSION:-CGMES_2.4.15_16FEB2016} -VILLAS_VERSION=${VILLAS_VERSION:-c976cd62d8c6667a078be0785ca3e623a05f7456} +VILLAS_VERSION=${VILLAS_VERSION:-66569cf9c43d2d7a4626b9a84321c4e340d3fe18} MAKE_PROCS=${MAKE_PROCS:-$(nproc)} MAKE_OPTS+="-j${MAKE_PROCS}" diff --git a/packaging/Shell/install-fedora-deps.sh b/packaging/Shell/install-fedora-deps.sh index 3bcc5d44b5..24e98ffd99 100644 --- a/packaging/Shell/install-fedora-deps.sh +++ b/packaging/Shell/install-fedora-deps.sh @@ -1,7 +1,7 @@ #!/bin/bash CIM_VERSION=${CIM_VERSION:-CGMES_2.4.15_16FEB2016} -VILLAS_VERSION=${VILLAS_VERSION:-c976cd62d8c6667a078be0785ca3e623a05f7456} +VILLAS_VERSION=${VILLAS_VERSION:-66569cf9c43d2d7a4626b9a84321c4e340d3fe18} MAKE_PROCS=${MAKE_PROCS:-$(nproc)} MAKE_OPTS+="-j${MAKE_PROCS}" diff --git a/packaging/Shell/install-ubuntu-deps.sh b/packaging/Shell/install-ubuntu-deps.sh index 855e047fdc..3ec1c2a23b 100644 --- a/packaging/Shell/install-ubuntu-deps.sh +++ b/packaging/Shell/install-ubuntu-deps.sh @@ -1,7 +1,7 @@ #!/bin/bash CIM_VERSION=${CIM_VERSION:-CGMES_2.4.15_16FEB2016} -VILLAS_VERSION=${VILLAS_VERSION:-c976cd62d8c6667a078be0785ca3e623a05f7456} +VILLAS_VERSION=${VILLAS_VERSION:-66569cf9c43d2d7a4626b9a84321c4e340d3fe18} MAKE_PROCS=${MAKE_PROCS:-$(nproc)} MAKE_OPTS+="-j${MAKE_PROCS}"