From cf10ff67e33cb7b2968e048f9c21ee72682d7b94 Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 11:21:01 +0800 Subject: [PATCH 1/8] Create release.yml --- .github/workflows/release.yml | 134 ++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..8269a31b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,134 @@ +name: Release X-ui +on: + push: + tags: + - 0.* + workflow_dispatch: + +jobs: + release: + runs-on: ubuntu-latest + outputs: + upload_url: ${{ steps.create_release.outputs.upload_url }} + steps: + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + draft: false + prerelease: true + linuxamd64build: + name: build x-ui amd64 version + needs: release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.18 + - name: build linux amd64 version + run: | + CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go + mkdir x-ui + cp xui-release x-ui/xui-release + cp x-ui.service x-ui/x-ui.service + cp x-ui.sh x-ui/x-ui.sh + cd x-ui + mv xui-release x-ui + mkdir bin + cd bin + wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-64.zip + unzip Xray-linux-64.zip + rm -f Xray-linux-64.zip + cd .. + cd .. + - name: package + run: tar -zcvf x-ui-linux-amd64.tar.gz x-ui + - name: upload + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + with: + upload_url: ${{ needs.release.outputs.upload_url }} + asset_path: x-ui-linux-amd64.tar.gz + asset_name: x-ui-linux-amd64.tar.gz + asset_content_type: application/gzip + linuxarm64build: + name: build x-ui arm64 version + needs: release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.18 + - name: build linux arm64 version + run: | + GOOS=linux GOARCH=arm64 go build -o xui-release -v main.go + mkdir x-ui + cp xui-release x-ui/xui-release + cp x-ui.service x-ui/x-ui.service + cp x-ui.sh x-ui/x-ui.sh + cd x-ui + mv xui-release x-ui + mkdir bin + cd bin + wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-arm64-v8a.zip + unzip Xray-linux-arm64-v8a.zip + rm -f Xray-linux-arm64-v8a.zip + cd .. + cd .. + - name: package + run: tar -zcvf x-ui-linux-arm64.tar.gz x-ui + - name: upload + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + with: + upload_url: ${{ needs.release.outputs.upload_url }} + asset_path: x-ui-linux-arm64.tar.gz + asset_name: x-ui-linux-arm64.tar.gz + asset_content_type: application/gzip + linuxs390xbuild: + name: build x-ui s390x version + needs: release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.18 + - name: build linux s390x version + run: | + GOOS=linux GOARCH=s390x go build -o xui-release -v main.go + mkdir x-ui + cp xui-release x-ui/xui-release + cp x-ui.service x-ui/x-ui.service + cp x-ui.sh x-ui/x-ui.sh + cd x-ui + mv xui-release x-ui + mkdir bin + cd bin + wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-s390x.zip + unzip Xray-linux-s390x.zip + rm -f Xray-linux-s390x.zip + cd .. + cd .. + - name: package + run: tar -zcvf x-ui-linux-s390x.tar.gz x-ui + - name: upload + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + with: + upload_url: ${{ needs.release.outputs.upload_url }} + asset_path: x-ui-linux-s390x.tar.gz + asset_name: x-ui-linux-s390x.tar.gz + asset_content_type: application/gzip From fd5cfd785376a68307f3e33f1e24dea6f6943775 Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 11:21:35 +0800 Subject: [PATCH 2/8] Update install.sh --- install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.sh b/install.sh index bedf6a89..e1e1f2f5 100755 --- a/install.sh +++ b/install.sh @@ -35,6 +35,8 @@ if [[ $arch == "x86_64" || $arch == "x64" || $arch == "amd64" ]]; then arch="amd64" elif [[ $arch == "aarch64" || $arch == "arm64" ]]; then arch="arm64" +elif [[ $arch == "s390x" ]]; then + arch="s390x" else arch="amd64" echo -e "${red}检测架构失败，使用默认架构: ${arch}${plain}" From 8373c5eb38fa9ae4ab68b1e1ac98ea28516cd6f6 Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 11:36:39 +0800 Subject: [PATCH 3/8] Update release.yml --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8269a31b..3fbeb1e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,6 +45,7 @@ jobs: wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-64.zip unzip Xray-linux-64.zip rm -f Xray-linux-64.zip + mv xray xray-linux-amd64 cd .. cd .. - name: package @@ -82,6 +83,7 @@ jobs: wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-arm64-v8a.zip unzip Xray-linux-arm64-v8a.zip rm -f Xray-linux-arm64-v8a.zip + mv xray xray-linux-arm64 cd .. cd .. - name: package @@ -119,6 +121,7 @@ jobs: wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip rm -f Xray-linux-s390x.zip + mv xray xray-linux-s390x cd .. cd .. - name: package From 534cc5d5a25f50a0b07b898d38a2b5b0c35867ed Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 11:38:04 +0800 Subject: [PATCH 4/8] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3fbeb1e8..13dfd2f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} draft: false - prerelease: true + prerelease: false linuxamd64build: name: build x-ui amd64 version needs: release From ebb9ee58273f3a90335e3bea79adbb35200f194b Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 11:48:26 +0800 Subject: [PATCH 5/8] Update release.yml --- .github/workflows/release.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13dfd2f6..8dcc6858 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: with: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} - draft: false + draft: true prerelease: false linuxamd64build: name: build x-ui amd64 version @@ -46,6 +46,9 @@ jobs: unzip Xray-linux-64.zip rm -f Xray-linux-64.zip mv xray xray-linux-amd64 + rm -f geoip.dat geosite.dat + wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat + wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat cd .. cd .. - name: package @@ -84,6 +87,9 @@ jobs: unzip Xray-linux-arm64-v8a.zip rm -f Xray-linux-arm64-v8a.zip mv xray xray-linux-arm64 + rm -f geoip.dat geosite.dat + wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat + wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat cd .. cd .. - name: package @@ -122,6 +128,9 @@ jobs: unzip Xray-linux-s390x.zip rm -f Xray-linux-s390x.zip mv xray xray-linux-s390x + rm -f geoip.dat geosite.dat + wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat + wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat cd .. cd .. - name: package From 6428dee149f0ee58e74f7ccf905204a739eda750 Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:30:20 +0800 Subject: [PATCH 6/8] Update release.yml --- .github/workflows/release.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8dcc6858..fcab08f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} draft: true - prerelease: false + prerelease: true linuxamd64build: name: build x-ui amd64 version needs: release @@ -42,13 +42,12 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-64.zip + wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-64.zip unzip Xray-linux-64.zip - rm -f Xray-linux-64.zip - mv xray xray-linux-amd64 - rm -f geoip.dat geosite.dat + rm -f Xray-linux-64.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + mv xray xray-linux-amd64 cd .. cd .. - name: package @@ -83,13 +82,12 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-arm64-v8a.zip + wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip unzip Xray-linux-arm64-v8a.zip - rm -f Xray-linux-arm64-v8a.zip - mv xray xray-linux-arm64 - rm -f geoip.dat geosite.dat + rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + mv xray xray-linux-arm64 cd .. cd .. - name: package @@ -124,13 +122,12 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/download/v1.5.4/Xray-linux-s390x.zip + wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip - rm -f Xray-linux-s390x.zip - mv xray xray-linux-s390x - rm -f geoip.dat geosite.dat + rm -f Xray-linux-s390x.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + mv xray xray-linux-s390x cd .. cd .. - name: package From 9fef61b813023d17e154e01e109aa878d47150b3 Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:31:18 +0800 Subject: [PATCH 7/8] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcab08f5..db5bc046 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: go-version: 1.18 - name: build linux amd64 version run: | - CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go + GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go mkdir x-ui cp xui-release x-ui/xui-release cp x-ui.service x-ui/x-ui.service From 509f3641e45f805ebe0e94c5a3ad36f18a3471a1 Mon Sep 17 00:00:00 2001 From: Misaka No <96560028+misakano7545@users.noreply.github.com> Date: Sat, 9 Apr 2022 16:19:03 +0800 Subject: [PATCH 8/8] Update release.yml --- .github/workflows/release.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db5bc046..9f7d7d11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: go-version: 1.18 - name: build linux amd64 version run: | - GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go + CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go mkdir x-ui cp xui-release x-ui/xui-release cp x-ui.service x-ui/x-ui.service @@ -73,7 +73,9 @@ jobs: go-version: 1.18 - name: build linux arm64 version run: | - GOOS=linux GOARCH=arm64 go build -o xui-release -v main.go + sudo apt-get update + sudo apt install gcc-aarch64-linux-gnu + CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release -v main.go mkdir x-ui cp xui-release x-ui/xui-release cp x-ui.service x-ui/x-ui.service @@ -113,7 +115,9 @@ jobs: go-version: 1.18 - name: build linux s390x version run: | - GOOS=linux GOARCH=s390x go build -o xui-release -v main.go + sudo apt-get update + sudo apt install gcc-s390x-linux-gnu -y + CGO_ENABLED=1 GOOS=linux GOARCH=s390x CC=s390x-linux-gnu-gcc go build -o xui-release -v main.go mkdir x-ui cp xui-release x-ui/xui-release cp x-ui.service x-ui/x-ui.service