Merge branch 'v2fly-master' into master

.github/dependabot.yml

@@ -1,7 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-- package-ecosystem: gomod
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/coverage.yml

@@ -2,30 +2,37 @@ name: Coverage
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
+    paths:
+      - "**/*.go"
 
 jobs:
-
-  build:
-    name: Coverage
+  coverage:
     runs-on: ubuntu-latest
-
     steps:
-
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
           go-version: ^1.14
-        id: go
 
-      - name: Check out code into the Go module directory
+      - name: Checkout codebase
         uses: actions/checkout@v2
 
+      - name: Cache go module
+        uses: actions/cache@v2
+        id: cache-gomodules
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Get dependencies
+        if: steps.cache-gomodules.outputs.cache-hit != 'true'
         run: |
           go get -v -t -d ./...
 
-      - name: Run Coverage
+      - name: Run coverage
         run: ./testing/coverage/coverall2
 
       - name: Upload coverage to Codecov

.github/workflows/docker.yaml

@@ -9,7 +9,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Checkout
+      - name: Checkout default branch
         uses: actions/checkout@v2
 
       - name: Install Buildx and QEMU
@@ -21,7 +21,7 @@ jobs:
           docker run --rm --privileged multiarch/qemu-user-static:latest --reset -p yes --credential yes
           docker buildx create --use --name build --node build --driver-opt network=host
 
-      - name: Log in to Docker Hub
+      - name: Login to Docker Hub
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/linter.yml

@@ -1,24 +1,59 @@
-name: Lint Code Base
+name: Lint
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
-    types: [assigned, opened, synchronize, reopened]
+    branches: [master]
+    types: [opened, synchronize, reopened]
 
 jobs:
-  build:
-    name: Lint Code Base
+  lint:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout Code
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.14
+
+      - name: Checkout codebase
         uses: actions/checkout@v2
 
-      - name: Lint Code Base
-        uses: github/super-linter@v2.2.0
+      - name: Cache go module
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: Show if need to format code
+        if: ${{ always() }}
+        run: |
+          filesNeedToFormat=$(go fmt ./...)
+          if [[ $filesNeedToFormat ]]; then
+            echo -e "\033[0;36m[Error] The following Go files need to be formatted:\033[0m"
+            echo -e "\033[0;31m$filesNeedToFormat\033[0m"
+            exit 1
+          fi
+
+      - name: Lint *.go files
+        if: ${{ always() }}
+        run: |
+          go vet $(go list ./... | grep -v /external/)
+          if [[ $? != 0 ]]; then
+            exit 1
+          fi
+
+      - name: Lint other files
+        if: ${{ always() }}
+        uses: github/super-linter@v3.9.2
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_ALL_CODEBASE: false
+          VALIDATE_BASH: false
+          VALIDATE_DOCKERFILE: false
+          VALIDATE_DOCKERFILE_HADOLINT: false
+          VALIDATE_GO: false
           VALIDATE_JSON: false
-          VALIDATE_ANSIBLE: false
+          VALIDATE_MD: false
+          VALIDATE_PROTOBUF: false

.github/workflows/sign.yml

@@ -1,37 +1,24 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Sign
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on:
   release:
     types: [released]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
+  sign:
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Invoke release signing
-      - name: make it run
-        run: chmod +x $GITHUB_WORKSPACE/release/requestsign_github.sh
+      - name: Checkout default branch
+        uses: actions/checkout@v2
 
-      # Invoke release signing
-      - name: make it run
-        run: chmod +x $GITHUB_WORKSPACE/release/requestsign.sh
+      - name: Grant it execution permission
+        run: |
+          chmod +x $GITHUB_WORKSPACE/release/requestsign_github.sh
+          chmod +x $GITHUB_WORKSPACE/release/requestsign.sh
 
-      # Invoke release signing
       - name: Invoke release signing
         env:
           SIGN_SERVICE_PASSWORD: ${{ secrets.SIGN_SERVICE_PASSWORD }}
           SIGN_SERIVCE_URL: ${{ secrets.SIGN_SERIVCE_URL }}
-          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
-        run: $GITHUB_WORKSPACE/release/requestsign_github.sh
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: $GITHUB_WORKSPACE/release/requestsign_github.sh

.github/workflows/stale.yml

@@ -2,17 +2,16 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: "30 1 * * *"
+    - cron: "30 1 * * *"
 
 jobs:
   stale:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/stale@v1
-      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'
-        days-before-stale: 120
-        days-before-close: 5
+      - uses: actions/stale@v3.0.10
+        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"
+          stale-pr-message: 'It has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days'
+          days-before-stale: 120
+          days-before-close: 5

.github/workflows/test.yml

@@ -2,33 +2,36 @@ name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
+    paths:
+      - "**/*.go"
   pull_request:
-    branches: [ master ]
+    branches: [master]
+    types: [opened, synchronize, reopened]
+    paths:
+      - "**/*.go"
 
 jobs:
-
-  build:
-    name: Test
+  test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-
     steps:
-
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
           go-version: ^1.14
-        id: go
 
-      - name: Check out code into the Go module directory
+      - name: Checkout codebase
         uses: actions/checkout@v2
 
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
+      - name: Cache go module
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
 
       - name: Test
-        run: go test -parallel 1 -timeout 6h -v ./...
+        run: go test -timeout 1h -v ./...

.github/workflows/updateGeofile.yml

@@ -0,0 +1,24 @@
+name: Update Geofiles
+
+on:
+  schedule:
+    - cron: "0 0 * * FRI"
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout codebase
+        uses: actions/checkout@v2
+
+      - name: Download
+        run: |
+          curl -L -o release/config/geoip.dat "https://github.com/v2fly/geoip/raw/release/geoip.dat"
+          curl -L -o release/config/geosite.dat "https://github.com/v2fly/domain-list-community/raw/release/dlc.dat"
+
+      - name: push
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git commit -am "update geoip, geosite"
+          git push -v --progress

README.md

@@ -11,7 +11,7 @@
 [9]: https://img.shields.io/github/downloads/v2ray/v2ray-core/total.svg "All releases badge"
 [10]: https://github.com/v2ray/v2ray-core/releases/ "All releases number"
 
-Project V is a set of network tools that help you to build your own computer network. It secures your network connections and thus protects your privacy. See [our website](https://www.v2ray.com/) for more information.
+Project V is a set of network tools that help you to build your own computer network. It secures your network connections and thus protects your privacy. See [our website](https://www.v2fly.org/) for more information.
 
 ## License