From b3bb794cfb8399814def44feee38893a80ee69f0 Mon Sep 17 00:00:00 2001 From: eugene Date: Sat, 11 Jan 2025 17:48:18 -0500 Subject: [PATCH 1/6] misc updates --- .github/actions/build/action.yml | 19 +++++++++++++------ .github/workflows/cmake.yml | 2 +- .gitignore | 5 ++++- deps/CMakeLists.txt | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index aa70f6f6..fb90eb1e 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -18,12 +18,17 @@ inputs: description: Ziti Test Identity runs: + env: + CI_CACHE: '${{ github.workspace }}/.ci.cache' + VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/.ci.cache,readwrite' + using: "composite" 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 - name: windows tools if: runner.os == 'Windows' @@ -31,12 +36,14 @@ runs: run: choco install pkgconfiglite - name: simple build - run: echo "target = ${{ inputs.target }}" + run: | + echo "target = ${{ inputs.target }}" + mkdir -p ${CI_CACHE} shell: bash - uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version: '1.23.x' cache-dependency-path: "**/*.sum" - uses: lukka/get-cmake@v3.30.1 @@ -45,8 +52,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 diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ec3057a5..781aca28 100644 --- a/.github/workflows/cmake.yml +++ b/.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: diff --git a/.gitignore b/.gitignore index 8e228b3b..a751e648 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,7 @@ Testing/ #additional stuff for localtesting local.cmake -/CMakeUserPresets.json +/CMakeUserPresets. + +## CI dirs +.ci.cache/ diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 667e00cb..890f5fa2 100644 --- a/deps/CMakeLists.txt +++ b/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) From 532d080964cfaf72cbbbbc2708fcd0648c0aac19 Mon Sep 17 00:00:00 2001 From: eugene Date: Sat, 11 Jan 2025 17:51:40 -0500 Subject: [PATCH 2/6] misc updates --- .github/actions/build/action.yml | 4 ---- .github/workflows/cmake.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index fb90eb1e..76a34414 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -18,10 +18,6 @@ inputs: description: Ziti Test Identity runs: - env: - CI_CACHE: '${{ github.workspace }}/.ci.cache' - VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/.ci.cache,readwrite' - using: "composite" steps: - name: macOS tools diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 781aca28..3851c581 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -18,6 +18,9 @@ jobs: image: ${{ matrix.spec.builder }} env: BUILD_NUMBER: ${{ github.run_number }} + CI_CACHE: '${{ github.workspace }}/.ci.cache' + VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/.ci.cache,readwrite' + strategy: fail-fast: false matrix: From 6f3c63881547b4497f600bfaa0787944ca902c4a Mon Sep 17 00:00:00 2001 From: eugene Date: Sat, 11 Jan 2025 17:54:29 -0500 Subject: [PATCH 3/6] macos: install libtool --- .github/actions/build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 76a34414..aaac9bc5 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -24,7 +24,7 @@ runs: if: runner.os == 'macOS' uses: gerlero/brew-install@v1 with: - packages: autoconf autoconf-archive automake pkg-config + packages: autoconf autoconf-archive automake pkg-config libtool - name: windows tools if: runner.os == 'Windows' From 856d81a84deedf07c450ba0478c8eaf56c11bac1 Mon Sep 17 00:00:00 2001 From: eugene Date: Sun, 12 Jan 2025 10:32:09 -0500 Subject: [PATCH 4/6] fix .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a751e648..80a4b912 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ Testing/ #additional stuff for localtesting local.cmake -/CMakeUserPresets. +/CMakeUserPresets.json ## CI dirs .ci.cache/ From 49deab598a047445e230ab586e678143366efecc Mon Sep 17 00:00:00 2001 From: eugene Date: Sun, 12 Jan 2025 13:02:47 -0500 Subject: [PATCH 5/6] fix inconsistent workspace path --- .github/actions/build/action.yml | 13 +++++++++---- .github/workflows/cmake.yml | 3 --- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index aaac9bc5..d66af700 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -31,11 +31,14 @@ runs: shell: bash run: choco install pkgconfiglite - - name: simple build + - name: setup build + shell: bash run: | - echo "target = ${{ inputs.target }}" + CI_CACHE="${GITHUB_WORKSPACE}/.ci.cache" + VCPKG_BINARY_SOURCES="clear;files,${GITHUB_WORKSPACE}/.ci.cache,readwrite" mkdir -p ${CI_CACHE} - shell: bash + echo "CI_CACHE=${CI_CACHE}" >> $GITHUB_ENV + echo "VCPKG_BINARY_SOURCES=${VCPKG_BINARY_SOURCES}" >> $GITHUB_ENV - uses: actions/setup-go@v5 with: @@ -58,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 diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3851c581..781aca28 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -18,9 +18,6 @@ jobs: image: ${{ matrix.spec.builder }} env: BUILD_NUMBER: ${{ github.run_number }} - CI_CACHE: '${{ github.workspace }}/.ci.cache' - VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/.ci.cache,readwrite' - strategy: fail-fast: false matrix: From 3830cdb07b50ebaacd96360b6bc103dfba47c430 Mon Sep 17 00:00:00 2001 From: eugene Date: Sun, 12 Jan 2025 15:45:32 -0500 Subject: [PATCH 6/6] update macos-arm release build --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ae78f641..f0d276d7 100644 --- a/.github/workflows/build-release.yml +++ b/.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' }