Merge branch 'master' into v5

This commit is contained in:
loyalsoldier
2021-04-13 14:19:02 +08:00
49 changed files with 986 additions and 11782 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.2
go-version: ^1.16.3
- name: Checkout codebase
uses: actions/checkout@v2
+18 -3
View File
@@ -5,6 +5,11 @@ on:
branches:
- master
- v*
pull_request:
types: [opened, synchronize, reopened]
paths:
- ".github/workflows/deb.yml"
- "release/debian/*"
release:
types: [prereleased]
@@ -18,21 +23,31 @@ jobs:
- name: Install git
run: |
apt-get update
apt-get install -y git
apt-get install -y git wget
- name: Checkout codebase
uses: actions/checkout@v2
with:
submodules: "recursive"
- name: Download geo files
run: |
wget -O release/config/geoip.dat "https://raw.githubusercontent.com/v2fly/geoip/release/geoip.dat"
wget -O release/config/geosite.dat "https://raw.githubusercontent.com/v2fly/domain-list-community/release/dlc.dat"
- name: Install build dependencies
run: |
apt-get install -y build-essential dh-golang golang-any reprepro
apt-get install -y build-essential dh-golang golang-1.16 reprepro
- name: Set environment variable
run: |
echo "PATH=/usr/lib/go-1.16/bin:${PATH}" >> $GITHUB_ENV
- name: Build
run: |
echo "PATH=${PATH}"
cp -r release/debian .
dpkg-buildpackage -us -uc -i -b
dpkg-buildpackage -us -uc -i -b -d
- name: Copy binary
run: |
+2 -2
View File
@@ -21,13 +21,13 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.16.2
go-version: ^1.16.3
- name: Checkout codebase
uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v2.5.1
uses: golangci/golangci-lint-action@v2.5.2
with:
version: latest
args: --config=.github/linters/.golangci.yml
+7 -2
View File
@@ -98,7 +98,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16.2
go-version: ^1.16.3
- name: Get project dependencies
run: go mod download
@@ -108,6 +108,11 @@ jobs:
mkdir -p build_assets
go build -v -o build_assets/v2ray -trimpath -ldflags "-s -w -buildid=" ./main
- name: Download geo files
run: |
wget -O release/config/geoip.dat "https://raw.githubusercontent.com/v2fly/geoip/release/geoip.dat"
wget -O release/config/geosite.dat "https://raw.githubusercontent.com/v2fly/domain-list-community/release/dlc.dat"
- name: Prepare package
run: cp -v ./release/config/*.* ./build_assets
@@ -154,7 +159,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16.2
go-version: ^1.16.3
- 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.2
go-version: ^1.16.3
- name: Checkout codebase
uses: actions/checkout@v2
-25
View File
@@ -1,25 +0,0 @@
name: Update Geofiles
on:
schedule:
- cron: "0 0 * * FRI"
jobs:
update:
if: github.repository == 'v2fly/v2ray-core'
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 "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