From 07a63bc9010e5a518e974634a802d6a8215c87fa Mon Sep 17 00:00:00 2001
From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Wed, 17 Feb 2021 05:16:31 +0800
Subject: [PATCH] Chore: refine workflows (#678)

---
 .github/workflows/codeql-analysis.yml | 68 ++++++++++-----------------
 .github/workflows/coverage.yml        | 11 -----
 .github/workflows/linter.yml          |  1 -
 .github/workflows/release.yml         |  6 +--
 .github/workflows/semgrep.yml         |  2 +-
 .github/workflows/sign.yml            |  1 -
 .github/workflows/test.yml            |  3 +-
 7 files changed, 29 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7ad399ddd..8ce357bef 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,67 +2,49 @@ name: CodeQL
 
 on:
   push:
-    branches:
-      - master
-      - v*
     paths:
       - "**/*.go"
+      - "go.mod"
+      - "go.sum"
   pull_request:
     types: [opened, synchronize, reopened]
     paths:
       - "**/*.go"
+      - "go.mod"
+      - "go.sum"
 
 jobs:
   analyze:
-    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['go']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+        language: ["go"]
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index f906fe8b3..f756d46a7 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -10,7 +10,6 @@ on:
 
 jobs:
   coverage:
-    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
@@ -21,17 +20,7 @@ jobs:
       - name: Checkout codebase
         uses: actions/checkout@v2
 
-      - name: Cache go module
-        uses: actions/cache@v2.1.4
-        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
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index f9421d64f..71b15b38b 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -14,7 +14,6 @@ on:
 
 jobs:
   lint:
-    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a374580c1..d277d159d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,6 @@ on:
 
 jobs:
   build:
-    if: github.repository != 'v2ray/v2ray-core'
     strategy:
       matrix:
         # Include amd64 on all platforms.
@@ -97,7 +96,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: ^1.15
 
       - name: Get project dependencies
         run: go mod download
@@ -152,7 +151,6 @@ jobs:
           tag: ${{ github.ref }}
 
   signature:
-    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     needs: build
     steps:
@@ -164,7 +162,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: ^1.15
 
       - uses: actions/download-artifact@v2
         with:
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
index b100959b3..0f5b3637f 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/semgrep.yml
@@ -5,7 +5,7 @@ jobs:
     name: Scan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: returntocorp/semgrep-action@v1
         env: # Optional environment variable for inline PR comments (beta)
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml
index 49f85f366..ed7d36888 100644
--- a/.github/workflows/sign.yml
+++ b/.github/workflows/sign.yml
@@ -6,7 +6,6 @@ on:
 
 jobs:
   sign:
-    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout default branch
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 317f697e1..ee3cc8940 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,6 @@ on:
 
 jobs:
   test:
-    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -34,4 +33,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test
-        run: go test -v -timeout 1h ./...
\ No newline at end of file
+        run: go test -v -timeout 1h ./...