Merge branch 'master' into dev-wsimprovement

This commit is contained in:
loyalsoldier
2021-03-28 08:40:05 +08:00
102 changed files with 8833 additions and 8806 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.16.2
- name: Checkout codebase
uses: actions/checkout@v2
+1 -1
View File
@@ -21,7 +21,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.16.2
- name: Checkout codebase
uses: actions/checkout@v2
+2 -2
View File
@@ -98,7 +98,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.16.2
- name: Get project dependencies
run: go mod download
@@ -164,7 +164,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.16.2
- uses: actions/download-artifact@v2
with:
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.16.2
- name: Checkout codebase
uses: actions/checkout@v2
+2 -2
View File
@@ -19,7 +19,7 @@ jobs:
- name: push
run: |
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git commit -am "update geoip, geosite"
git push -v --progress