fix: Set x-abi-tools-use-exact-versions to true

Workaround CMake 3.29.1 issue with Parquet: G-Research/ParquetSharp#440 Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Apr 10, 2024 · 7c05b76 · 7c05b76
1 parent 416adc9
commit 7c05b76
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 35 deletions.
diff --git a/.github/workflows/prebuild-gh_envs.yml b/.github/workflows/prebuild-gh_envs.yml
@@ -128,21 +128,6 @@ jobs:
         run: |
           brew install bison flex pkg-config automake libtool autoconf autoconf-archive
 
-      - name: "Only run on windows"
-        if: ${{ startsWith(matrix.os, 'windows') }}
-        working-directory: ..
-        shell: pwsh
-        run: |
-          Remove-Item -Path "${{ github.workspace }}" -Recurse -Force
-          New-Item -ItemType Directory -Path "C:\workspace"
-          New-Item -ItemType SymbolicLink -Path "${{ github.workspace }}" -Target "C:\workspace"
-  
-      - name: "Remove builtin vcpkg (old)"
-        working-directory: .
-        shell: "bash"
-        run: |
-          ${{ matrix.sudo }} rm -rf "$VCPKG_INSTALLATION_ROOT"
-
       - name: Check out source code
         uses: actions/checkout@v3
         with:
@@ -171,9 +156,12 @@ jobs:
             -source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
 
       - name: "Update nuget (overlays)"
+        working-directory: .
         shell: "bash"
         run: |
-          ./vcpkg install --overlay-ports=./overlays --keep-going --triplet ${{ matrix.triplet }}
+          ./vcpkg install \
+            --x-abi-tools-use-exact-versions \
+            --triplet=${{ matrix.triplet }}
 
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}

diff --git a/dockerfiles/centos-7.dockerfile b/dockerfiles/centos-7.dockerfile
@@ -5,8 +5,8 @@ RUN yum update -y && yum install -y \
     centos-release-scl \
     https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm && \
     yum group install -y "Development Tools" && yum install -y \
-    autoconf-archive \
     autoconf \
+    autoconf-archive \
     automake \
     curl \
     git \
@@ -128,7 +128,7 @@ RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
     --triplet=x64-centos-7-dynamic
-# ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-centos-7-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
+# ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-centos-7-dynamic
 
 RUN mkdir -p /hpcc-dev/tools/cmake
 RUN cp -r $(dirname $(dirname `./vcpkg fetch cmake | tail -n 1`))/* /hpcc-dev/tools/cmake
@@ -152,10 +152,10 @@ RUN yum makecache && yum install -y \
 ENV Rcpp_package=Rcpp_0.12.19.tar.gz
 ENV RInside_package=RInside_0.2.12.tar.gz
 
-RUN wget https://cran.r-project.org/src/contrib/Archive/Rcpp/${Rcpp_package}
-RUN wget https://cran.r-project.org/src/contrib/Archive/RInside/${RInside_package}
-RUN R CMD INSTALL ${Rcpp_package} ${RInside_package}
-RUN rm -f ${Rcpp_package} ${RInside_package}
+RUN wget https://cran.r-project.org/src/contrib/Archive/Rcpp/${Rcpp_package} && \
+    wget https://cran.r-project.org/src/contrib/Archive/RInside/${RInside_package} && \
+    R CMD INSTALL ${Rcpp_package} ${RInside_package} && \
+    rm -f ${Rcpp_package} ${RInside_package}
 
 WORKDIR /hpcc-dev
 

diff --git a/dockerfiles/centos-8.dockerfile b/dockerfiles/centos-8.dockerfile
@@ -6,15 +6,16 @@ RUN yum update -y && yum install -y dnf-plugins-core && \
     autoconf \
     autoconf-archive \
     automake \
-    git \
     curl \
+    git \
     libtool \
     perl-IPC-Cmd \
     python3 \
-    unzip \
     tar \
+    unzip \
     yum-utils \
-    zip 
+    zip && \
+    yum -y clean all && rm -rf /var/cache
 
 RUN yum -y install gcc-toolset-11-gcc gcc-toolset-11-gcc-c++
 
@@ -24,14 +25,13 @@ SHELL ["/bin/bash", "--login", "-c"]
 FROM base_build AS vcpkg_build
 
 # Build Tools - Mono  ---
-RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/
-RUN yum clean all
-RUN yum makecache
-RUN rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
-
-RUN dnf config-manager --add-repo https://download.mono-project.com/repo/centos8-stable.repo
-
-RUN dnf install -y mono-complete 
+RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ && \
+    yum clean all && \
+    yum makecache && \
+    rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
+    dnf config-manager --add-repo https://download.mono-project.com/repo/centos8-stable.repo && \
+    yum install -y mono-complete && \
+    yum -y clean all && rm -rf /var/cache
 
 ARG NUGET_MODE=readwrite
 ENV VCPKG_BINARY_SOURCES="clear;nuget,GitHub,${NUGET_MODE}"
@@ -62,7 +62,7 @@ RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
     --triplet=x64-linux-dynamic
-# ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
+# ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-linux-dynamic
 
 RUN mkdir -p /hpcc-dev/tools/cmake
 RUN cp -r $(dirname $(dirname `./vcpkg fetch cmake | tail -n 1`))/* /hpcc-dev/tools/cmake
@@ -81,7 +81,8 @@ RUN yum remove -y python3.11 java-1.* && yum install -y \
     ccache \
     R-core-devel \
     R-Rcpp-devel \
-    R-RInside-devel
+    R-RInside-devel && \
+    yum -y clean all && rm -rf /var/cache
 
 WORKDIR /hpcc-dev