Solve workflow conflict (#294)

* Solve workflow conflict Solve workflow conflict from master-2.x and master * Update main.yml Apply neo-project/neo#1775 Co-authored-by: Shargon <[email protected]>
neo-project · Jul 17, 2020 · 804181f · 804181f
1 parent dcd946a
commit 804181f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,10 @@
 name: .NET Core Test and Publish
 
-on: pull_request
-
+on: 
+  push:
+    branches: master
+  pull_request:
+
 env:
   DOTNET_VERSION: 3.1.100
 
@@ -11,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with: