Merge pull request #684 from openziti/update-ci-things

Update CI: builder and actions
openziti · Jul 8, 2024 · 5b62ad0 · 5b62ad0
2 parents a50f101 + 6adefe0
commit 5b62ad0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git 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
 

diff --git 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: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' }
@@ -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
@@ -19,19 +19,19 @@ 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: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' }
           - { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' }
     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-*