adding GitHub CI pipeline

agracio · Sep 15, 2024 · 35b3e64 · 35b3e64
1 parent 8931d51
commit 35b3e64
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,10 +41,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [macos-14, macos-latest, ubuntu-latest, windows-2019]
-        os: [ windows-2019]
-        # electron: [29.4.6, 30.5.1, 31.6.0]
-        electron: [31.6.0, 32.1.0]
+        os: [macos-14, macos-latest, ubuntu-latest, windows-2019]
+        # os: [ windows-2019]
+        electron: [29.4.6, 30.5.1, 31.6.0]
+        # electron: [31.6.0, 32.1.0]
 
     name: test-${{ matrix.os }}-${{ matrix.electron }}
     steps:
@@ -116,17 +116,13 @@ jobs:
 
       - if: runner.os == 'Windows' && steps.check_windows_build.outputs.files_exists == 'true'
         name: Run .NET 4.5 tests Windows
-        run: |
-          node tools/test.js CI
-          set EDGE_USE_CORECLR=1
-          echo "EDGE_USE_CORECLR=1" >> $GITHUB_ENV
-          node tools/test.js CI
+        run: node tools/test.js CI
 
-      # - if: runner.os == 'Windows' && steps.check_windows_build.outputs.files_exists == 'true'
-      #   name: "Run .net core tests Windows"
-      #   run: node tools/test.js CI
-      #   env:
-      #     EDGE_USE_CORECLR: 1
+      - if: runner.os == 'Windows' && steps.check_windows_build.outputs.files_exists == 'true'
+        name: "Run .net core tests Windows"
+        run: node tools/test.js CI
+        env:
+          EDGE_USE_CORECLR: 1
 
       - if: runner.os == 'macOS' && steps.check_build.outputs.files_exists == 'true'
         name: "Run .net core tests macOS"
@@ -151,7 +147,7 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/[email protected]
-        if: success() && (steps.check_build.outputs.files_exists == 'true' || runner.os == 'Windows')
+        if: success() && (steps.check_build.outputs.files_exists == 'true' || steps.check_windows_build.outputs.files_exists == 'true')
         with:
           name: ${{ matrix.os }}-${{ matrix.electron }}
           path: |
@@ -160,7 +156,7 @@ jobs:
 
       - name: Create test report
         uses: phoenix-actions/test-reporting@v15
-        if: success() && (steps.check_build.outputs.files_exists == 'true' || runner.os == 'Windows')
+        if: success() && (steps.check_build.outputs.files_exists == 'true' || steps.check_windows_build.outputs.files_exists == 'true')
         with:
           name: test-results-${{ matrix.os }}-${{ matrix.electron }}
           fail-on-error: true

diff --git a/test/app.js b/test/app.js
@@ -41,7 +41,7 @@ exports.runTests = function (framework, window){
     //if (typeof framework === "undefined") return;
 
     //process.env.EDGE_USE_CORECLR = framework;
-    console.log(`runner: ${runner}`);
+    // console.log(`runner: ${runner}`);
     var version = process.env.EDGE_USE_CORECLR ? 'CoreCLR' : process.platform === 'win32' ? '.NET Framework 4.5' : 'Mono Framework';
     //var prefix = process.env.EDGE_USE_CORECLR ? 'CoreCLR' : 'NET';
     var prefix = '';
@@ -68,11 +68,11 @@ exports.runTests = function (framework, window){
     run.on('end', function(){
         setTimeout(function(){
           mocha.dispose();
-          console.log('runComplete')
+          // console.log('runComplete')
           window.webContents.send("runComplete", reportFilename);
-          console.log('run end')
+          // console.log('run end')
           if(runner === 'CI'){
-            console.log('window.close()')
+            // console.log('window.close()')
             window.close();
           }
         }, 1000);