chore: Squash commits for 9.8.0 gold release

.github/workflows/prebuild-docker.yml

@@ -5,7 +5,7 @@ on:
     tags:
       - "*"
     branches:
-      - "hpcc-platform-9.6.x"
+      - "hpcc-platform-9.8.x"
 
   workflow_call:
     inputs:

.github/workflows/prebuild-gh_envs.yml

@@ -6,7 +6,7 @@ env:
 on:
   push:
     branches:
-      - "hpcc-platform-9.6.x"
+      - "hpcc-platform-9.8.x"
 
   workflow_call:
     inputs:
@@ -143,6 +143,7 @@ jobs:
         run: |
           ./vcpkg install \
             --x-abi-tools-use-exact-versions \
+            --host-triplet=${{ matrix.triplet }} \
             --triplet=${{ matrix.triplet }}
 
       - name: Upload error logs

dockerfiles/amazonlinux.dockerfile

@@ -44,30 +44,30 @@ RUN ./configure --prefix=/usr/local/pkg_config/0_29_2 --with-internal-glib && \
 ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig
 ENV ACLOCAL_PATH=$ACLOCAL_PATH:/usr/local/share/aclocal
 
-RUN curl -o autoconf-2.71.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \
+RUN curl -o autoconf-2.71.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \
     gunzip autoconf-2.71.tar.gz && \
     tar xvf autoconf-2.71.tar && \
     cd autoconf-2.71 && \
     ./configure && \
     make && \
     make install
 
-RUN curl -o autoconf-archive-2021.02.19.tar.xz http://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \
+RUN curl -o autoconf-archive-2021.02.19.tar.xz https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \
     xz -d -v autoconf-archive-2021.02.19.tar.xz && \
     tar xvf autoconf-archive-2021.02.19.tar && \
     cd autoconf-archive-2021.02.19 && \
     ./configure && \
     make && \
     make install
 
-RUN curl -o automake-1.16.5.tar.gz http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \
+RUN curl -o automake-1.16.5.tar.gz https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \
     tar xvzf automake-1.16.5.tar.gz && \
     cd automake-1.16.5 && \
     ./configure && \
     make && \
     make install
 
-RUN curl -o libtool-2.4.6.tar.gz http://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \
+RUN curl -o libtool-2.4.6.tar.gz https://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \
     tar xvfz libtool-2.4.6.tar.gz && \
     cd libtool-2.4.6 && \
     ./configure --prefix=/usr/local/libtool/2_4_6 && \
@@ -98,10 +98,10 @@ RUN ln -s /usr/local/libtool/2_4_6/bin/libtool /usr/local/bin/ && \
 FROM base_build AS vcpkg_build
 
 # Build Tools - Mono  ---
-RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ && \
+RUN yum-config-manager --add-repo https://download.mono-project.com/repo/centos/ && \
     yum clean all && \
     yum makecache && \
-    rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
+    rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
     yum install -y mono-complete && \
     yum -y clean all && rm -rf /var/cache
 
@@ -133,6 +133,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-amazonlinux-dynamic \
     --triplet=x64-amazonlinux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-amazonlinux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 

dockerfiles/build.sh

@@ -65,7 +65,8 @@ function doBuild() {
 # doBuild ubuntu-24.04
 # doBuild amazonlinux 
 # doBuild centos-7 &
-doBuild rockylinux-8 &
+doBuild centos-8 &
+# doBuild rockylinux-8 &
 # doBuild ubuntu-24.04 &
 # doBuild ubuntu-23.04 &
 # doBuild ubuntu-22.04 &

dockerfiles/centos-7.dockerfile

@@ -38,30 +38,30 @@ RUN ./configure --prefix=/usr/local/pkg_config/0_29_2 --with-internal-glib && \
 ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig
 ENV ACLOCAL_PATH=$ACLOCAL_PATH:/usr/local/share/aclocal
 
-RUN curl -o autoconf-2.71.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \
+RUN curl -o autoconf-2.71.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \
     gunzip autoconf-2.71.tar.gz && \
     tar xvf autoconf-2.71.tar && \
     cd autoconf-2.71 && \
     ./configure && \
     make && \
     make install
 
-RUN curl -o autoconf-archive-2021.02.19.tar.xz http://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \
+RUN curl -o autoconf-archive-2021.02.19.tar.xz https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \
     xz -d -v autoconf-archive-2021.02.19.tar.xz && \
     tar xvf autoconf-archive-2021.02.19.tar && \
     cd autoconf-archive-2021.02.19 && \
     ./configure && \
     make && \
     make install
 
-RUN curl -o automake-1.16.5.tar.gz http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \
+RUN curl -o automake-1.16.5.tar.gz https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \
     tar xvzf automake-1.16.5.tar.gz && \
     cd automake-1.16.5 && \
     ./configure && \
     make && \
     make install
 
-RUN curl -o libtool-2.4.6.tar.gz http://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \
+RUN curl -o libtool-2.4.6.tar.gz https://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \
     tar xvfz libtool-2.4.6.tar.gz && \
     cd libtool-2.4.6 && \
     ./configure --prefix=/usr/local/libtool/2_4_6 && \
@@ -92,10 +92,10 @@ RUN ln -s /usr/local/libtool/2_4_6/bin/libtool /usr/local/bin/ && \
 FROM base_build AS vcpkg_build
 
 # Build Tools - Mono  ---
-RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ && \
+RUN yum-config-manager --add-repo https://download.mono-project.com/repo/centos/ && \
     yum clean all && \
     yum makecache && \
-    rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
+    rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
     yum install -y mono-complete && \
     yum -y clean all && rm -rf /var/cache
 
@@ -127,6 +127,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-centos-7-dynamic \
     --triplet=x64-centos-7-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-centos-7-dynamic
 

dockerfiles/centos-8.dockerfile

@@ -1,4 +1,7 @@
-FROM tgagor/centos-stream:stream8 AS base_build
+FROM tgagor/centos:stream8 AS base_build
+
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*.repo
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*.repo
 
 RUN yum update -y && yum install -y dnf-plugins-core && \
     dnf config-manager --set-enabled powertools && \
@@ -25,10 +28,10 @@ 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-config-manager --add-repo https://download.mono-project.com/repo/centos/ && \
     yum clean all && \
     yum makecache && \
-    rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
+    rpm --import "https://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
@@ -61,6 +64,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-linux-dynamic
 

dockerfiles/rockylinux-8.dockerfile

@@ -14,6 +14,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
     libtool \
     perl-IPC-Cmd \
     python3 \
+    rpm-build \
     tar \
     unzip \
     zip && \
@@ -28,8 +29,8 @@ FROM base_build AS vcpkg_build
 
 # Build Tools - Mono  ---
 RUN dnf install -y 'dnf-command(config-manager)'
-RUN rpmkeys --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
-    dnf config-manager --add-repo http://download.mono-project.com/repo/centos8-stable/ && \
+RUN rpmkeys --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
+    dnf config-manager --add-repo https://download.mono-project.com/repo/centos8-stable/ && \
     dnf clean all && \
     dnf makecache && \
     dnf install -y mono-complete
@@ -62,6 +63,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-linux-dynamic
 

dockerfiles/ubuntu-20.04.dockerfile

@@ -62,6 +62,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 

dockerfiles/ubuntu-22.04.dockerfile

@@ -62,8 +62,9 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --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 --host-triplet=x64-linux-dynamic --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 
 RUN mkdir -p /hpcc-dev/tools/cmake
 RUN cp -r $(dirname $(dirname `./vcpkg fetch cmake | tail -n 1`))/* /hpcc-dev/tools/cmake

dockerfiles/ubuntu-24.04.dockerfile

@@ -59,6 +59,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 

overlays/nlp-engine/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO VisualText/nlp-engine
   REF v${VERSION}
-  SHA512 d874bb29b405efbb5f988f4c5e08d9caa0afd1a2b7ec95a3d580095a89d703511b1a9deb9cf036e9b53e0416b307ec4b911bf5dafa2f6418faf36bb80effa40e
+  SHA512 a6871cb3db10a1d4bd7d5290141a82e788269da28b2d995963825dc4c50025e6099f5f872e4538054b7fb169773b6d6d3e73e3dd102bc3e0cbb5bddcd95ae484
   HEAD_REF master
 )
 

overlays/nlp-engine/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "nlp-engine",
-  "version-semver": "2.8.15",
+  "version-semver": "2.10.6",
   "port-version": 0,
   "homepage": "https://github.com/VisualText/nlp-engine",
   "description": "The NLP engine is a cross-platform text analysis tool that can be accessed through a command line executable or by calling its C++ functions from another language.",