fix cpack builds

.github/actions/build/action.yml

@@ -32,11 +32,11 @@ runs:
     - name: install contemporary cmake
       uses: lukka/[email protected] # pin version to avoid failed glibc dependency on ubuntu 20 runners. go back to @latest when ubuntu 22+ is adopted for runner os.
 
-    - uses: lukka/run-vcpkg@v10
+    - uses: lukka/run-vcpkg@v11
       with:
-        # use 2024.07.12 vcpkg baseline,
+        # use 2024.08.23 vcpkg baseline,
         # see https://learn.microsoft.com/en-us/vcpkg/users/examples/versioning.getting-started#builtin-baseline
-        vcpkgGitCommitId: '1de2026f28ead93ff1773e6e680387643e914ea1'
+        vcpkgGitCommitId: '3508985146f1b1d248c67ead13f8f54be5b4f5da'
 
     - uses: lukka/[email protected] # pin version to avoid failed glibc dependency on ubuntu 20 runners. go back to @latest when ubuntu 22+ is adopted for runner os.
       name: Configure CMake

.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile

@@ -25,6 +25,7 @@ RUN dnf install -y \
         systemd-rpm-macros \
         cmake-rpm-macros  \
         openssl-devel \
+        perl \
     && dnf config-manager --set-enabled powertools \
     && dnf install -y \
         doxygen \
@@ -42,7 +43,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
 ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
-    && git clone --branch 2024.07.12 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2024.08.23 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 WORKDIR /github/workspace

.github/actions/openziti-tunnel-build-action/redhat-8/entrypoint.sh

@@ -21,7 +21,7 @@ fi
 if [ ${#} -ge 2 ]; then
     cmake_config="${2}"
 else
-    cmake_config="Release"
+    cmake_config="RelWithDebInfo"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.

.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile

@@ -1,5 +1,5 @@
 ARG CMAKE_VERSION="3.26.3"
-ARG VCPKG_VERSION="2024.07.12"
+ARG VCPKG_VERSION="2024.08.23"
 
 FROM rockylinux:9
 
@@ -25,6 +25,7 @@ RUN dnf install -y \
         systemd-rpm-macros \
         cmake-rpm-macros  \
         openssl-devel \
+        perl-FindBin perl-IPC-Cmd perl-File-Compare perl-File-Copy \
         libatomic \
     && dnf config-manager --set-enabled crb \
     && dnf install -y \

.github/actions/openziti-tunnel-build-action/redhat-9/entrypoint.sh

@@ -21,7 +21,7 @@ fi
 if [ ${#} -ge 2 ]; then
     cmake_config="${2}"
 else
-    cmake_config="Release"
+    cmake_config="RelWithDebInfo"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.

.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile

@@ -16,6 +16,7 @@ WORKDIR /root/
 
 RUN apt-get update \
     && apt-get -y install \
+        autoconf automake autopoint \
         gcc-arm-linux-gnueabihf \
         g++-arm-linux-gnueabihf \
         gcc-aarch64-linux-gnu \
@@ -27,6 +28,7 @@ RUN apt-get update \
         git \
         graphviz \
         libsystemd-dev \
+        libtool \
         pkg-config \
         python3 \
         zlib1g-dev \
@@ -55,7 +57,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
     && git config --global advice.detachedHead false \
-    && git clone --branch 2024.07.12 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2024.08.23 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 COPY ./entrypoint.sh /root/

.github/actions/openziti-tunnel-build-action/ubuntu-20.04/entrypoint.sh

@@ -15,13 +15,13 @@ echo "INFO: $(git --version)"
 if [ ${#} -ge 1 ]; then
     cmake_preset="${1}"
 else
-    cmake_preset="ci-linux-x64"
+    cmake_preset="ci-linux-x64-static-libssl"
 fi
 
 if [ ${#} -ge 2 ]; then
     cmake_config="${2}"
 else
-    cmake_config="Release"
+    cmake_config="RelWithDebInfo"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.

.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile

@@ -1,5 +1,5 @@
 ARG CMAKE_VERSION="3.26.3"
-ARG VCPKG_VERSION="2024.07.12"
+ARG VCPKG_VERSION="2024.08.23"
 
 # Ubuntu Jammy 22.04 LTS
 FROM ubuntu:jammy
@@ -18,6 +18,7 @@ WORKDIR /root/
 
 RUN apt-get update \
     && apt-get -y install \
+        autoconf automake autopoint \
         gcc-arm-linux-gnueabihf \
         g++-arm-linux-gnueabihf \
         gcc-aarch64-linux-gnu \
@@ -29,6 +30,7 @@ RUN apt-get update \
         git \
         graphviz \
         libsystemd-dev \
+        libtool \
         pkg-config \
         python3 \
         zlib1g-dev \

.github/actions/openziti-tunnel-build-action/ubuntu-22.04/entrypoint.sh

@@ -15,13 +15,13 @@ echo "INFO: $(git --version)"
 if [ ${#} -ge 1 ]; then
     cmake_preset="${1}"
 else
-    cmake_preset="ci-linux-x64"
+    cmake_preset="ci-linux-x64-static-libssl"
 fi
 
 if [ ${#} -ge 2 ]; then
     cmake_config="${2}"
 else
-    cmake_config="Release"
+    cmake_config="RelWithDebInfo"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.

.github/cpack-matrix.yml

@@ -1,12 +1,12 @@
 cpack_matrix:
   arch:
-    - cmake: ci-linux-x64  # selects cmake preset
+    - cmake: ci-linux-x64-static-libssl  # selects cmake preset
       rpm: x86_64          # yum $basearch
       deb: amd64           # dpkg --print-architecture
-    - cmake: ci-linux-arm
+    - cmake: ci-linux-arm-static-libssl
       rpm: armhfp
       deb: armhf
-    - cmake: ci-linux-arm64
+    - cmake: ci-linux-arm64-static-libssl
       rpm: aarch64
       deb: arm64
   distro:
@@ -32,8 +32,8 @@ cpack_matrix:
     - distro:
         name: redhat
       arch:
-        cmake: ci-linux-arm
+        cmake: ci-linux-arm-static-libssl
     - distro:
         name: redhat
       arch:
-        cmake: ci-linux-arm64
+        cmake: ci-linux-arm64-static-libssl

.github/workflows/cpack.yml

@@ -97,15 +97,15 @@ jobs:
         uses: ./.github/actions/openziti-tunnel-build-action
         with:
           arch: ${{ matrix.arch.cmake }}
-          config: Release
+          config: RelWithDebInfo
 
       - name: list artifacts
         shell: bash
         run: |
           set -x
           cat /etc/*-release
           ls -horAS ./build/*.${{ matrix.distro.type }}
-          ls -horAS ./build/programs/ziti-edge-tunnel/Release/ziti-edge-tunnel
+          ls -horAS ./build/programs/ziti-edge-tunnel/RelWithDebInfo/ziti-edge-tunnel
 
       - name: install package artifact in runner container if Ubuntu x86_64
         if: ${{ matrix.arch.cmake == 'ci-linux-x64' && matrix.distro.name == 'ubuntu' }}
@@ -129,7 +129,7 @@ jobs:
           set -x
           cat /etc/*-release
           ldd ./build/programs/ziti-edge-tunnel/Release/ziti-edge-tunnel
-          ./build/programs/ziti-edge-tunnel/Release/ziti-edge-tunnel version --verbose
+          ./build/programs/ziti-edge-tunnel/RelWithDebInfo/ziti-edge-tunnel version --verbose
 
       - name: Upload Package to Workflow Summary Page
         uses: actions/upload-artifact@v4

vcpkg.json

@@ -28,5 +28,5 @@
       ]
     }
   },
-  "builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1"
+  "builtin-baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da"
 }