Merge branch 'master' into v5

This commit is contained in:
loyalsoldier
2021-02-24 17:26:17 +08:00
45 changed files with 8142 additions and 7905 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.15
go-version: ^1.16
- name: Checkout codebase
uses: actions/checkout@v2
+5 -3
View File
@@ -7,10 +7,12 @@ on:
- v*
paths:
- "**/*.go"
- ".github/workflows/linter.yml"
pull_request:
types: [opened, synchronize, reopened]
paths:
- "**/*.go"
- ".github/workflows/linter.yml"
jobs:
lint:
@@ -19,14 +21,14 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.15
go-version: ^1.16
- name: Checkout codebase
uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v2.4.0
uses: golangci/golangci-lint-action@v2.5.1
with:
version: v1.31
version: latest
args: --config=.github/linters/.golangci.yml
only-new-issues: true
+5 -2
View File
@@ -51,6 +51,8 @@ jobs:
goarch: arm
goarm: 7
# BEGIN Other architectures
- goos: darwin
goarch: arm64
- goos: linux
goarch: arm64
- goos: linux
@@ -96,7 +98,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.15
go-version: ^1.16
- name: Get project dependencies
run: go mod download
@@ -152,7 +154,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.15
go-version: ^1.16
- uses: actions/download-artifact@v2
with:
@@ -160,6 +162,7 @@ jobs:
- name: Generate shasum
run: |
go get -v github.com/v2fly/V2BuildAssist/v2buildutil
cd build_artifacts || exit 1
mkdir .temp
mv ./*/*.zip ./.temp
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3.0.16
- uses: actions/stale@v3.0.17
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: "This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days"
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.15
go-version: ^1.16
- name: Checkout codebase
uses: actions/checkout@v2