Move uuid to ports (#938)

AntaresSimulatorTeam · Oct 7, 2024 · 2be863f · 2be863f
1 parent 8f9eb7f
commit 2be863f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -24,4 +24,4 @@ jobs:
           workdir: docker
           dockerfile: centos7-system-deps
           cache: false
-          tags: latest,1.1.0
+          tags: latest,1.1.1
diff --git 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
@@ -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"