CI cleanup

zeroc-ice · May 28, 2024 · 0466885 · 0466885
1 parent 7409f29
commit 0466885
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Ice Build Dependencies
         uses: ./ice/.github/actions/setup-dependencies
 
-      - name: Build Iice on ${{ matrix.os }}
+      - name: Build Ice on ${{ matrix.os }}
         uses: ./ice/.github/actions/build
         timeout-minutes: 90
         with:
@@ -48,18 +48,9 @@ jobs:
         with:
           path: ice-demos
 
-      - name: Build Ice Demos on ${{ matrix.os }}
-        timeout-minutes: 90
-        working-directory: ice-demos/cpp
-        run: |
-          export ICE_HOME=$GITHUB_WORKSPACE/ice
-          make
-        if: ${{ runner.os != 'Windows' }}
-
-      - name: Build Ice Demos on ${{ matrix.os }}
-        timeout-minutes: 90
-        working-directory: ice-demos/cpp
-        run: |
-          export ICE_HOME=$GITHUB_WORKSPACE/ice
-          make
-        if: ${{ runner.os == 'Windows' }}
+      - name: Build C++ Demos on ${{ matrix.os }}
+        uses: ./ice/.github/actions/build
+        timeout-minutes: 30
+        with:
+          working_directory: ice/cpp
+          msbuild_project: C++11 demos.sln