lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into v5

Browse Source
This commit is contained in:
loyalsoldier 2020-11-27 08:35:04 +08:00
commit a7fa78c9a6
No known key found for this signature in database
GPG Key ID: 23829BBC1ACF2C90
4 changed files with 7380 additions and 7371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/deb.yml vendored
View File

@ -7,11 +7,13 @@ on:
- v* - v*
paths: paths:
- "**/*.go" - "**/*.go"
- "go.mod"
- "go.sum"
release: release:
types: [prereleased] types: [prereleased]
jobs: jobs:
build: package:
if: github.repository == 'v2fly/v2ray-core' if: github.repository == 'v2fly/v2ray-core'
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: debian:sid container: debian:sid

6
.github/workflows/release.yml vendored
View File

@ -12,19 +12,15 @@ on:
- "**/*.go" - "**/*.go"
- "go.mod" - "go.mod"
- "go.sum" - "go.sum"
- ".github/workflows/*.yml"
- ".github/workflows/*.yaml"
pull_request: pull_request:
types: [opened, synchronize, reopened] types: [opened, synchronize, reopened]
paths: paths:
- "**/*.go" - "**/*.go"
- "go.mod" - "go.mod"
- "go.sum" - "go.sum"
- ".github/workflows/*.yml"
- ".github/workflows/*.yaml"
jobs: jobs:
release: build:
if: github.repository != 'v2ray/v2ray-core' if: github.repository != 'v2ray/v2ray-core'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

BIN
release/config/geoip.dat
View File

Binary file not shown.

14741
release/config/geosite.dat
View File

File diff suppressed because it is too large Load Diff