File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -20,11 +20,16 @@ jobs:
20
20
with :
21
21
go-version : 1.14.4 # optional
22
22
- name : Update Dependency
23
+ <<<<<<< HEAD
24
+ =======
25
+ if : ${{ ! endsWith(${{ github.ref }}, 'update-dependencies') }}
26
+ env :
27
+ GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
28
+ >>>>>>> 103dcd0... Test conditional execution
23
29
run : go get -u ./...
24
30
25
- - name : Verify Defference
31
+ - name : Test
26
32
run : |
27
- echo "Verifying"
28
33
make install
29
34
make test
30
35
Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ module github.com/wechaty/go-wechaty-getting-started
2
2
3
3
go 1.14
4
4
5
+ <<<<<<< HEAD
5
6
require (
6
7
github.com/golang/protobuf v1.4.2 // indirect
7
8
github.com/maruel/rs v1.0.0 // indirect
@@ -18,3 +19,7 @@ require (
18
19
google.golang.org/grpc v1.31.1 // indirect
19
20
google.golang.org/protobuf v1.25.0 // indirect
20
21
)
22
+ =======
23
+ require github.com/wechaty/go-wechaty v0.1.2
24
+
25
+ >>>>>>> 103dcd0... Test conditional execution
You can’t perform that action at this time.
0 commit comments