fixes

externl · Dec 22, 2023 · ce49d55 · ce49d55
1 parent f0e7940
commit ce49d55
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,15 +1,29 @@
 name: Build Ice
 
-# inputs:
-#   languages:
-#     description: "Language to build"
-#     required: true
-#     type: sequence
+inputs:
+  cpp:
+    description: "Build C++ (Makefile build systems only)"
+    required: false
+    default: false
+    type: boolean
 
 runs:
   using: "composite"
   steps:
-    - name: Build
+    - name: Build Slice compilers
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        make -C cpp -j3 V=1 slice2cpp slice2js slice2py slice2rb slice2php slice2java slice2cs slice2swift
+      shell: bash
+      if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
+
+    - name: Build C++
+      if: inputs.cpp
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        make -C cpp -j3 V=1
+
+    - name: Build join(matrix.languages, ', ')
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         make -j3 V=1 LANGUAGES="${{ join(matrix.languages, ' ') }}"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,15 +17,17 @@ jobs:
     name: ${{ join(matrix.languages, ',') }} / ${{ matrix.os }}
     strategy:
       matrix:
-        languages: [[cpp], [csharp], [java], [python], [js]] # languages available on all os
+        languages: [[cpp], [csharp], [java], [js]] # languages available on all os
         os: [macos-latest, ubuntu-latest, windows-latest]
         include:
           - os: macos-latest
             languages: swift
           - os: macos-latest
-            languages: [php, ruby]
+            languages: [php, ruby, python]
+            cpp: true
           - os: ubuntu-latest
-            languages: [php, ruby]
+            languages: [php, ruby, python]
+            cpp: true
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -56,10 +58,6 @@ jobs:
 
       - name: Build ${{ join(matrix.languages, ',') }} on ${{ matrix.os }}
         uses: ./.github/actions/build
-        # with:
-        #   languages: ${{ matrix.languages }}
 
       - name: Test ${{ join(matrix.languages, ',') }} on ${{ matrix.os }}
         uses: ./.github/actions/test
-        # with:
-        #   languages: ${{ matrix.languages }}