use cmake composite action for linux builds

openziti · Jul 17, 2023 · 4b65cf4 · 4b65cf4
1 parent 0b19b9b
commit 4b65cf4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,10 +1,10 @@
-name: Reusable build
-description: Reusable CMake build for non-Linux OS
+name: CMake build
+description: CMake Composite Action
 
 inputs:
   preset:
     required: true
-    description: build preset, e.g, windows-arm64
+    description: vcpkg build preset, e.g, windows-arm64
 
   config:
     default: Release

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -59,15 +59,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Run CMake for Linux
-        if: ${{ matrix.container != null }}
-        run: |
-          ./ziti-builder.sh \
-            -p "ci-${{ matrix.preset }}" \
-            -t bundle
-
-      - name: Run CMake for non-Linux platforms
-        if: ${{ matrix.container == null }}
+      - name: Run CMake Composite Action
         uses: ./.github/actions/build
         with:
           preset: ${{ matrix.preset }}