fixes

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

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,18 +1,18 @@
 name: Build Ice
 
-inputs:
-  languages:
-    description: "Language to build"
-    required: true
-    type: sequence
+# inputs:
+#   languages:
+#     description: "Language to build"
+#     required: true
+#     type: sequence
 
 runs:
   using: "composite"
   steps:
     - name: Build
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        make -j3 V=1 LANGUAGES="${{ join(inputs.languages, ' ') }}"
+        make -j3 V=1 LANGUAGES="${{ join(matrix.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,11 +1,6 @@
 name: Test Ice
 
 inputs:
-  languages:
-    description: "Language to test"
-    required: true
-    type: array
-
   flags:
     description: "Flags to pass to the test"
     required: false
@@ -15,12 +10,12 @@ runs:
   using: "composite"
   steps:
     - name: Test
-      run: python3 allTests.py --all --workers=4 --export-xml=test-report.xml --languages=${{ join(inputs.languages, ', ') }} ${{ inputs.flags }}
+      run: python3 allTests.py --all --workers=4 --export-xml=test-report.xml --languages=${{ join(matrix.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=${{ join(inputs.languages, ', ') }} ${{ inputs.flags }}
+      run: python allTests.py --all --export-xml=test-report.xml --platform=x64 --workers=4 --languages=${{ join(matrix.languages, ', ') }} ${{ inputs.flags }}
       shell: powershell
       if: startsWith(matrix.os, 'windows')
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   ci:
-    name: ${{ matrix.language }} / ${{ matrix.os }}
+    name: ${{ join(matrix.languages, ',') }} / ${{ matrix.os }}
     strategy:
       matrix:
         languages: [[cpp], [csharp], [java], [python], [js]] # languages available on all os
@@ -56,10 +56,10 @@ jobs:
 
       - name: Build ${{ join(matrix.languages, ',') }} on ${{ matrix.os }}
         uses: ./.github/actions/build
-        with:
-          languages: ${{ matrix.languages }}
+        # with:
+        #   languages: ${{ matrix.languages }}
 
       - name: Test ${{ join(matrix.languages, ',') }} on ${{ matrix.os }}
         uses: ./.github/actions/test
-        with:
-          languages: ${{ matrix.languages }}
+        # with:
+        #   languages: ${{ matrix.languages }}