fixes

externl · Dec 22, 2023 · a6a9e85 · a6a9e85
1 parent 7f80678
commit a6a9e85
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,12 +1,17 @@
 name: Build Ice
 
+inputs:
+  languages:
+    description: "Language to build"
+    required: true
+
 runs:
   using: "composite"
   steps:
     - name: Build
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        make -j3 V=1
+        make -j3 V=1 LANGUAGES="${{ join(inputs.languages, ' ') }}"
       shell: bash
       if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
 

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -1,28 +1,25 @@
 name: Test Ice
 
 inputs:
-  language:
+  languages:
     description: "Language to test"
     required: true
-    # default: "1"
-    # options: ["cpp", "csharp", "java", "python", "js", "swift", "php", "ruby"]
 
   flags:
     description: "Flags to pass to the test"
     required: false
     default: ""
-    # options: ["cpp", "csharp", "java", "python", "js", "swift", "php", "ruby"]
 
 runs:
   using: "composite"
   steps:
     - name: Test
-      run: python3 allTests.py --all --workers=4 --export-xml=test-report.xml --languages=${{ inputs.language }} ${{ inputs.flags }}
+      run: python3 allTests.py --all --workers=4 --export-xml=test-report.xml --languages=${{ join(inputs.languages, ', ') }} ${{ inputs.flags }}
       shell: bash
       if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
 
     - name: Test
-      run: python allTests.py --all --export-xml=test-report.xml --platform=x64 --workers=4 --languages=${{ inputs.language }} ${{ inputs.flags }}
+      run: python allTests.py --all --export-xml=test-report.xml --platform=x64 --workers=4 --languages=${{ join(inputs.languages, ', ') }} ${{ inputs.flags }}
       shell: powershell
       if: startsWith(matrix.os, 'windows')
 

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