Merge branch 'master' into v5

.github/workflows/coverage.yml

@@ -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

.github/workflows/linter.yml

@@ -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

.github/workflows/release.yml

@@ -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
@@ -154,12 +154,18 @@ 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:
           path: build_artifacts
 
+      - name: Create extra package
+        run: |
+          pushd ./release/extra/
+          zip -9vr ../../build_artifacts/v2ray-extra.zip .
+          popd
+
       - name: Generate shasum
         run: |
           go get -v github.com/v2fly/V2BuildAssist/v2buildutil
@@ -195,6 +201,11 @@ jobs:
           name: Release.unsigned.dgst
           path: build_artifacts/Release.unsigned.dgst
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: v2ray-extra.zip
+          path: build_artifacts/v2ray-extra.zip
+
       - name: Upload Release.unsigned related files
         uses: svenstaro/upload-release-action@v2
         if: github.event_name == 'release'
@@ -203,3 +214,12 @@ jobs:
           file_glob: true
           file: build_artifacts/Release.unsigned*
           tag: ${{ github.ref }}
+
+      - name: Upload extra package
+        uses: svenstaro/upload-release-action@v2
+        if: github.event_name == 'release'
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file_glob: true
+          file: build_artifacts/v2ray-extra.zip
+          tag: ${{ github.ref }}

.github/workflows/test.yml

@@ -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

.github/workflows/updateGeofile.yml

@@ -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