From 2be863f562bc37e5bdee90ab6b05c9d86544ddee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20Mar=C3=A9chal?= <45510813+JasonMarechal25@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:28:39 +0200 Subject: [PATCH] Move uuid to ports (#938) --- .github/workflows/build_centos7.yml | 4 ++-- .github/workflows/build_oracle8.yml | 2 +- .github/workflows/publish_centos_docker.yml | 2 +- docker/centos7-system-deps | 3 +-- vcpkg.json | 6 ++++++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_centos7.yml b/.github/workflows/build_centos7.yml index d281b0dcc..828c6644b 100644 --- a/.github/workflows/build_centos7.yml +++ b/.github/workflows/build_centos7.yml @@ -40,7 +40,7 @@ jobs: workdir: docker dockerfile: centos7-system-deps cache: false - tags: 1.1.0 + tags: 1.1.1 versions: runs-on: ubuntu-latest @@ -67,7 +67,7 @@ jobs: build: runs-on: ubuntu-latest needs: [ docker_publish, versions ] - container: 'antaresrte/xpansion-centos7:1.1.0' + container: 'antaresrte/xpansion-centos7:1.1.1' env: VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: $GITHUB_WORKSPACE/or-tools diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml index 629d5d0c1..c8cf7bee4 100644 --- a/.github/workflows/build_oracle8.yml +++ b/.github/workflows/build_oracle8.yml @@ -53,7 +53,7 @@ jobs: - name: Install System run: | dnf install -y epel-release git wget rpm-build redhat-lsb-core - dnf install -y unzip libuuid-devel gcc-toolset-11-toolchain python3-devel zlib-devel + dnf install -y unzip gcc-toolset-11-toolchain python3-devel zlib-devel #make gcc &co available system wide and "action wide" source /opt/rh/gcc-toolset-11/enable echo $PATH >> $GITHUB_PATH diff --git a/.github/workflows/publish_centos_docker.yml b/.github/workflows/publish_centos_docker.yml index 2dbd51b6d..6aec727f2 100644 --- a/.github/workflows/publish_centos_docker.yml +++ b/.github/workflows/publish_centos_docker.yml @@ -24,4 +24,4 @@ jobs: workdir: docker dockerfile: centos7-system-deps cache: false - tags: latest,1.1.0 \ No newline at end of file + tags: latest,1.1.1 \ No newline at end of file diff --git a/docker/centos7-system-deps b/docker/centos7-system-deps index 068bb455c..4c68196a3 100644 --- a/docker/centos7-system-deps +++ b/docker/centos7-system-deps @@ -18,8 +18,7 @@ RUN \ yum install -y wget git epel-release redhat-lsb-core gcc gcc-c++ make centos-release-scl scl-utils &&\ yum install -y devtoolset-11-gcc* environment-modules rpm-build zlib-devel &&\ yum install -y doxygen graphviz &&\ - yum install -y install python3-devel && \ - yum install -y libuuid-devel + yum install -y install python3-devel RUN \ yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm &&\ diff --git a/vcpkg.json b/vcpkg.json index 3291d49e8..c006b78fc 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,12 +1,18 @@ { "name": "antares-xpansion", "version-string": "1.3.2", + "$comment 1": "libuuid by transitivity for Simulator-> yuni", + "$comment 2": "sirius-solver by transitivity for Simulator", "dependencies": [ "jsoncpp", "gtest", "gflags", "sirius-solver", "coin-or-cbc", + { + "name": "libuuid", + "platform": "!windows" + }, { "name": "boost-mpi", "version>=": "1.81.0"