Merge pull request #805 from openziti/dep-updates

update [email protected]

.github/actions/build/action.yml

@@ -22,21 +22,27 @@ runs:
   steps:
     - name: macOS tools
       if: runner.os == 'macOS'
-      shell: bash
-      run: brew install autoconf autoconf-archive automake pkg-config
+      uses: gerlero/brew-install@v1
+      with:
+        packages: autoconf autoconf-archive automake pkg-config libtool
 
     - name: windows tools
       if: runner.os == 'Windows'
       shell: bash
       run: choco install pkgconfiglite
 
-    - name: simple build
-      run: echo "target = ${{ inputs.target }}"
+    - name: setup build
       shell: bash
+      run: |
+        CI_CACHE="${GITHUB_WORKSPACE}/.ci.cache"
+        VCPKG_BINARY_SOURCES="clear;files,${GITHUB_WORKSPACE}/.ci.cache,readwrite"
+        mkdir -p ${CI_CACHE}
+        echo "CI_CACHE=${CI_CACHE}" >> $GITHUB_ENV
+        echo "VCPKG_BINARY_SOURCES=${VCPKG_BINARY_SOURCES}" >> $GITHUB_ENV
 
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.22.x'
+        go-version: '1.23.x'
         cache-dependency-path: "**/*.sum"
 
     - uses: lukka/[email protected]
@@ -45,8 +51,8 @@ runs:
 
     - uses: actions/cache@v4
       with:
-        key: deps-${{ inputs.target }}-${{ hashFiles('./vcpkg.json') }}
-        path: './vcpkg/packages'
+        key: vbc-${{ inputs.target }}-${{ hashFiles('./vcpkg.json') }}
+        path: ${{ env.CI_CACHE }}
 
     - uses: lukka/run-cmake@v10
       name: Configure CMake
@@ -55,7 +61,9 @@ runs:
         configurePresetAdditionalArgs: "[ `-B`, `./build` ]"
 
     - name: build CMake
-      run: cmake --build ./build --config ${{ inputs.config }}
+      run: |
+        cmake --build ./build --config ${{ inputs.config }}
+        ls -lR ${CI_CACHE}
       shell: bash
 
     - name: bundle artifacts

.github/workflows/build-release.yml

@@ -21,7 +21,7 @@ jobs:
           - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:v2' }
           - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:v2' }
           - { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64' }
-          - { name: 'MacOS arm64', runner: 'macOS-13', target: 'macOS-arm64' }
+          - { name: 'MacOS arm64', runner: 'macOS-14', target: 'macOS-arm64' }
           - { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64' }
           - { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' }
 

.github/workflows/cmake.yml

@@ -26,7 +26,7 @@ jobs:
           - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:v2' }
           - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:v2' }
           - { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64', test: 'true' }
-          - { name: 'MacOS arm64', runner: 'macOS-13', target: 'macOS-arm64' }
+          - { name: 'MacOS arm64', runner: 'macOS-14', target: 'macOS-arm64', test: 'true' }
           - { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' }
           - { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' }
     steps:

.gitignore

@@ -25,3 +25,6 @@ Testing/
 #additional stuff for localtesting
 local.cmake
 /CMakeUserPresets.json
+
+## CI dirs
+.ci.cache/

deps/CMakeLists.txt

@@ -9,7 +9,7 @@ if (NOT TARGET tlsuv)
     else ()
         FetchContent_Declare(tlsuv
                 GIT_REPOSITORY https://github.com/openziti/tlsuv.git
-                GIT_TAG v0.33.2
+                GIT_TAG v0.33.3
         )
         FetchContent_MakeAvailable(tlsuv)
     endif (tlsuv_DIR)