more fixes

externl · Apr 17, 2024 · 99a2ea4 · 99a2ea4
1 parent c2ea509
commit 99a2ea4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -16,14 +16,24 @@ inputs:
 runs:
   using: "composite"
   steps:
-    # Linux / macOS
+    #  macOS
     - name: Build
-      run: make -j3 V=1
+      run: make ${{ inputs.make_flags }} -4 V=1
       shell: bash
-      if: (runner.os == 'macOS' || runner.os == 'Linux')
+      if: (runner.os == 'macOS') || (runner.os == 'ubuntu')
+
+    #  Linux
+    - name: Build
+      run: |
+        make ${{ inputs.make_flags }} -4 V=1
+        make LANGUAGES=matlab ${{ inputs.make_flags }} -4 V=1
+      shell: bash
+      if: runner.os == 'Linux'
 
     # Windows
     - name: Build
-      run: msbuild /m /p:Platform=${{ inputs.msbuild_platform }} ice.proj
+      run: |
+        msbuild /m /p:Platform=${{ inputs.msbuild_platform }} ice.proj
+        msbuild /m /p:Platform=${{ inputs.msbuild_platform }} matlab/msbuild/ice.proj
       shell: powershell
-      if: (runner.os == 'Windows')
+      if: runner.os == 'Windows'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,23 +19,14 @@ jobs:
     strategy:
       matrix:
         os: [macos-14, ubuntu-latest, windows-latest]
-        name: ["Default configuration"]
+        name: ["default"]
         make_flags: [""]
         test_flags: [""]
-        # include:
-        #   - os: macos-14
-        #     language: swift
-        #   - os: macos-14
-        #     language: python
-        #   - os: macos-14
-        #     language: php
-        #   - os: macos-14
-        #     language: ruby
-        # - os: macos-14
-        # name: "xcodesdk"
-        # make_flags: "CONFIGS=xcodesdk PLATFORMS=iphonesimulator"
-        # test_flags: "--config=xcodesdk --platform=iphonesimulator --controller-app"
-
+        include:
+          - os: macos-14
+            name: "xcodesdk"
+            make_flags: "CONFIGS=xcodesdk PLATFORMS=iphonesimulator"
+            test_flags: "--config=xcodesdk --platform=iphonesimulator --controller-app"
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -59,4 +50,4 @@ jobs:
           # See:
           # - https://github.com/zeroc-ice/ice/issues/1653 IceGrid/replication
           # - https://github.com/zeroc-ice/ice/issues/1945 matlab/Ice/slicing
-          flags: "--rfilter IceGrid/replication --rfilter matlab/Ice/slicing ${{ matrix.test_flags }}"
+          flags: "--rfilter=IceGrid/replication --rfilter=matlab/Ice/slicing ${{ matrix.test_flags }}"
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Build C++
         working-directory: ./cpp
-        run: make -j3 V=1 srcs
+        run: make -j4 V=1 srcs
 
       - name: Generate Doxygen Documentation for Slice
         working-directory: ./doxygen
@@ -46,7 +46,7 @@ jobs:
       - name: Generate Documentation for Swift
         working-directory: ./swift
         run: |
-          make -j3 V=1
+          make -j4 V=1
 
           xcodebuild docbuild \
             -project ice.xcodeproj \