Merge remote-tracking branch 'origin/master'

This commit is contained in:
yuzuki999
2022-06-06 10:08:12 +08:00
4 changed files with 14 additions and 32 deletions

View File

@@ -120,17 +120,17 @@ jobs:
- name: Build XrayR - name: Build XrayR
run: | run: |
mkdir -p build_assets mkdir -p build_assets
go build -v -o build_assets/XrayR -trimpath -ldflags "-s -w -buildid=" ./main go build -v -o build_assets/V2bX -trimpath -ldflags "-s -w -buildid=" ./main
- name: Build Mips softfloat XrayR - name: Build Mips softfloat V2bX
if: matrix.goarch == 'mips' || matrix.goarch == 'mipsle' if: matrix.goarch == 'mips' || matrix.goarch == 'mipsle'
run: | run: |
GOMIPS=softfloat go build -v -o build_assets/XrayR_softfloat -trimpath -ldflags "-s -w -buildid=" ./main GOMIPS=softfloat go build -v -o build_assets/XrayR_softfloat -trimpath -ldflags "-s -w -buildid=" ./main
- name: Rename Windows XrayR - name: Rename Windows V2bX
if: matrix.goos == 'windows' if: matrix.goos == 'windows'
run: | run: |
cd ./build_assets || exit 1 cd ./build_assets || exit 1
mv XrayR XrayR.exe mv V2bX V2bX.exe
- name: Prepare to release - name: Prepare to release
run: | run: |
cp ${GITHUB_WORKSPACE}/README.md ./build_assets/README.md cp ${GITHUB_WORKSPACE}/README.md ./build_assets/README.md
@@ -168,18 +168,18 @@ jobs:
done done
- name: Change the name - name: Change the name
run: | run: |
mv build_assets XrayR-$ASSET_NAME mv build_assets V2bX-$ASSET_NAME
- name: Upload files to Artifacts # - name: Upload files to Artifacts
uses: actions/upload-artifact@v2 # uses: actions/upload-artifact@v2
with: # with:
name: XrayR-${{ steps.get_filename.outputs.ASSET_NAME }} # name: V2bX-${{ steps.get_filename.outputs.ASSET_NAME }}
path: | # path: |
./XrayR-${{ steps.get_filename.outputs.ASSET_NAME }}/* # ./V2bX-${{ steps.get_filename.outputs.ASSET_NAME }}/*
- name: Upload binaries to release - name: Upload binaries to release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2
if: github.event_name == 'release' if: github.event_name == 'release'
with: with:
repo_token: ${{ secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ./XrayR-${{ steps.get_filename.outputs.ASSET_NAME }}.zip* file: ./V2bX-${{ steps.get_filename.outputs.ASSET_NAME }}.zip*
tag: ${{ github.ref }} tag: ${{ github.ref }}
file_glob: true file_glob: true

View File

@@ -1,18 +0,0 @@
# Build go
FROM golang:1.18.1-alpine AS builder
WORKDIR /app
COPY . .
ENV CGO_ENABLED=0
RUN go mod download && \
go env -w GOFLAGS=-buildvcs=false && \
go build -v -o XrayR -trimpath -ldflags "-s -w -buildid=" ./main
# Release
FROM alpine
# 安装必要的工具包
RUN apk --update --no-cache add tzdata ca-certificates && \
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
mkdir /etc/XrayR/
COPY --from=builder /app/XrayR /usr/local/bin
ENTRYPOINT [ "XrayR", "--config", "/etc/XrayR/config.yml"]

View File

@@ -3,7 +3,7 @@
[![](https://img.shields.io/badge/TgChat-@XrayR讨论-blue.svg)](https://t.me/XrayR_project) [![](https://img.shields.io/badge/TgChat-@XrayR讨论-blue.svg)](https://t.me/XrayR_project)
[![](https://img.shields.io/badge/Channel-@XrayR通知-blue.svg)](https://t.me/XrayR_channel) [![](https://img.shields.io/badge/Channel-@XrayR通知-blue.svg)](https://t.me/XrayR_channel)
A V2board backend based on Xray-core, modified from XrayR A V2board node server based on Xray-core, modified from XrayR
一个基于Xray-core的V2board节点服务端修改自XrayR支持V2ay,Trojan,Shadowsocks协议。 一个基于Xray-core的V2board节点服务端修改自XrayR支持V2ay,Trojan,Shadowsocks协议。

View File

@@ -23,7 +23,7 @@ var (
) )
var ( var (
version = "v0.0.1" version = "v0.0.2"
codename = "V2bX" codename = "V2bX"
intro = "A V2board backend based on Xray" intro = "A V2board backend based on Xray"
) )