From 37151753785e4e319053547da85a403ee5ac67eb Mon Sep 17 00:00:00 2001 From: ekoby Date: Mon, 8 Jul 2024 14:30:04 -0400 Subject: [PATCH 1/4] update ziti-builder@2.0.2 --- .github/workflows/build-release.yml | 6 +++--- .github/workflows/cmake.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 7f74f51b..9c8b6797 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,9 +17,9 @@ jobs: fail-fast: false matrix: spec: - - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:1.0.7' } - - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:1.0.7' } - - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:1.0.7' } + - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:2.0.2' } + - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:2.0.2' } + - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:2.0.2' } - { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64' } - { name: 'MacOS arm64', runner: 'macOS-13', target: 'macOS-arm64' } - { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64' } diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cc4fb2f3..6054b0c5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,9 +19,9 @@ jobs: fail-fast: false matrix: spec: - - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:1.0.11', test: 'true' } - - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:1.0.11' } - - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:1.0.11' } + - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:2.0.2', test: 'true' } + - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:2.0.2' } + - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:2.0.2' } - { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64', test: 'true' } - { name: 'MacOS arm64', runner: 'macOS-13', target: 'macOS-arm64' } - { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' } From 7b191588169a60aa287c70693092ba1b07a305e6 Mon Sep 17 00:00:00 2001 From: ekoby Date: Mon, 8 Jul 2024 14:38:08 -0400 Subject: [PATCH 2/4] update actions: - actions/checkout@v4 - actions/upload-artifacts@v4 - microsoft/setup-msbuild@v2 --- .github/workflows/build-release.yml | 8 ++++---- .github/workflows/cmake.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 9c8b6797..70414c18 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -28,9 +28,9 @@ jobs: steps: - name: Add msbuild to PATH if: startsWith(matrix.spec.runner, 'windows') - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -50,13 +50,13 @@ jobs: ./build/programs/ziti-prox-c/ziti-prox-c-*.zip - name: "upload pre-release artifacts: ziti-prox-c" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ziti-prox-c-${{ matrix.spec.target }} path: ./build/programs/ziti-prox-c/**/ziti-prox-c*.zip - name: upload SDK pre-release artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ziti-sdk-${{ matrix.spec.target }} path: ./build/package/ziti-sdk-* diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 6054b0c5..47643313 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -29,9 +29,9 @@ jobs: steps: - name: Add msbuild to PATH if: startsWith(matrix.spec.runner, 'windows') - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -43,13 +43,13 @@ jobs: test_id: ${{ secrets.ZITI_TEST_IDENTITY }} - name: upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ziti-prox-c-${{ matrix.spec.target }} path: ./build/programs/ziti-prox-c/**/ziti-prox-c*.zip - name: upload SDK artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ziti-sdk-${{ matrix.spec.target }} path: ./build/package/ziti-sdk-* From d85d16ffdc5f6e00f4901eb75140e545e8ac493c Mon Sep 17 00:00:00 2001 From: ekoby Date: Mon, 8 Jul 2024 14:42:42 -0400 Subject: [PATCH 3/4] update actions/setup-go@v5 --- .github/actions/build/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 057bba34..02fd3f23 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -24,9 +24,10 @@ runs: run: echo "target = ${{ inputs.target }}" shell: bash - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: '1.22.x' + cache-dependency-path: "**/*.sum" - uses: lukka/get-cmake@v3.27.6 From 6adefe059422507c86a11d37774cf1a1b6a44e0f Mon Sep 17 00:00:00 2001 From: ekoby Date: Mon, 8 Jul 2024 15:05:16 -0400 Subject: [PATCH 4/4] pin to major ziti-builder version --- .github/workflows/build-release.yml | 6 +++--- .github/workflows/cmake.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 70414c18..32a1e12c 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,9 +17,9 @@ jobs: fail-fast: false matrix: spec: - - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:2.0.2' } - - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:2.0.2' } - - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:2.0.2' } + - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:v2' } + - { 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: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64' } diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 47643313..ade3aed4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,9 +19,9 @@ jobs: fail-fast: false matrix: spec: - - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:2.0.2', test: 'true' } - - { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:2.0.2' } - - { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:2.0.2' } + - { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:v2', test: 'true' } + - { 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: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' }