Merge pull request #194 from TotallyNotChase/ci-fixes

Fix coverage CI
Gwion · Oct 5, 2020 · 99eab3c · 99eab3c
2 parents 498b9c2 + 7803344
commit 99eab3c
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 42 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,14 +18,19 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
 
     steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Init submodules
+      run: git submodule update --init util ast
+
     - name: Build Gwion
-      uses: fennecdjay/gwion-action@v1
-      with:
-        dir: .
-        ref: ${{ github.sha }}
-        run: 'true'
+      run: make
       env:
         USE_COVERAGE: 1
+
+    - name: Test Gwion
+      run: make test
 
     - uses: actions/setup-python@v1
       with:
@@ -51,7 +56,13 @@ jobs:
         COV_NUM=${COV_TXT: : -1}
         echo $COV_NUM > gwion-coverage-report/coverage_num.txt
         sed -i 's/<html>/<script type="text\/javascript" src="..\/focus.js"><\/script><html>/' index.src_*.html
-        branch=$(basename ${{ github.event.ref }})
+        if [ "${{ github.event_name }}" == "push" ]
+        then
+          ref="${{ github.ref }}"
+        else
+          ref="${{ github.event.head.ref }}"
+        fi
+        branch=$(basename ref)
         cd gwion-coverage-report/
         bash old.sh $branch
         bash summary.sh
@@ -91,21 +102,3 @@ jobs:
         git add .
         git commit -m "Update html report"
         git push origin HEAD:gh-pages
-#        git push origin --set-upstream origin gh-pages
-#        git add -f html
-#        git commit -m "Update html report"
-#        git subtree push --prefix html origin gh-pages
-
-
-    - name: Send mail
-      uses: dawidd6/action-send-mail@master
-      with:
-        server_address: smtp.gmail.com
-        server_port: 465
-        username: ${{ secrets.MAIL_USERNAME }}
-        password: ${{ secrets.MAIL_PASSWORD }}
-        subject: Github Actions job result
-        body: file://diff.html
-        to: ${{ github.event.repository.owner.email }},${{ github.event.pusher.email }}
-        from: Gwion Coverage action
-        content_type: text/html
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -2,7 +2,11 @@ name: Linux
 
 on:
   push:
-    branches:    
+    branches:
+    - '**'
+    - '!gh-pages'
+  pull_request:
+    branches:
     - '**'
     - '!gh-pages'
 
@@ -17,12 +21,18 @@ jobs:
         double: [0, 1]
 
     steps:
-    - name: Build Gwion
-      uses: fennecdjay/gwion-action@v1
-      with:
-        ref: ${{ github.sha }}
-        run: true
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Init submodules
+      run: git submodule update --init util ast
+
+    - name: Build
+      run: make
       env:
         CC: ${{ matrix.cc }}
         USE_DOUBLE: ${{ matrix.double }}
         USE_DEBUG: 1
+
+    - name: Test
+      run: make test
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -5,6 +5,10 @@ on:
     branches:    
     - '**'
     - '!gh-pages'
+  pull_request:
+    branches:
+    - '**'
+    - '!gh-pages'
 
 jobs:
   build:
@@ -17,12 +21,18 @@ jobs:
         double: [0, 1]
 
     steps:
-    - name: Build Gwion
-      uses: fennecdjay/gwion-action@v1
-      with:
-        ref: ${{ github.sha }}
-        run: true
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Init submodules
+      run: git submodule update --init util ast
+
+    - name: Build
+      run: make
       env:
         CC: ${{ matrix.cc }}
+        USE_DOUBLE: ${{ matrix.double }}
         USE_DEBUG: 1
-        USE_DOUBLE: 1
+
+    - name: Test
+      run: make test
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -5,6 +5,10 @@ on:
     branches:    
     - '**'
     - '!gh-pages'
+  pull_request:
+    branches:
+    - '**'
+    - '!gh-pages'
 
 jobs:
   build:
@@ -16,13 +20,20 @@ jobs:
         double: [0, 1]
 
     steps:
-    - name: Build Gwion
-      uses: fennecdjay/gwion-action@v1
-      with:
-        dir: .
-        ref: ${{ github.sha }}
-        run: true
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Init submodules
+      run: git submodule update --init util ast
+
+    - name: Build
+      run: make
       env:
         CC: gcc
         USE_DOUBLE: ${{ matrix.double }}
         BUILD_ON_WINDOWS: 1
+
+    - name: Test
+      run: make test
+      env:
+        BUILD_ON_WINDOWS: 1