Skip to content

Commit 77d98e5

Browse files
committed
Test conditional execution
1 parent 145f4c7 commit 77d98e5

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/extra.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@ jobs:
2020
with:
2121
go-version: 1.14.4 # optional
2222
- 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
2329
run: go get -u ./...
2430

25-
- name: Verify Defference
31+
- name: Test
2632
run: |
27-
echo "Verifying"
2833
make install
2934
make test
3035

go.mod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module github.com/wechaty/go-wechaty-getting-started
22

33
go 1.14
44

5+
<<<<<<< HEAD
56
require (
67
github.com/golang/protobuf v1.4.2 // indirect
78
github.com/maruel/rs v1.0.0 // indirect
@@ -18,3 +19,7 @@ require (
1819
google.golang.org/grpc v1.31.1 // indirect
1920
google.golang.org/protobuf v1.25.0 // indirect
2021
)
22+
=======
23+
require github.com/wechaty/go-wechaty v0.1.2
24+
25+
>>>>>>> 103dcd0... Test conditional execution

0 commit comments

Comments
 (0)