From 08ddb382b8beaa798d3cfdffb997881bf6376ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=90=B2=93=F0=90=B3=9B=F0=90=B3=AA=F0=90=B3=82?=
 =?UTF-8?q?=F0=90=B3=90=20=F0=90=B2=80=F0=90=B3=A2=F0=90=B3=A6=F0=90=B3=AB?=
 =?UTF-8?q?=F0=90=B3=A2=20=F0=90=B2=A5=F0=90=B3=94=F0=90=B3=9B=F0=90=B3=AA?=
 =?UTF-8?q?=F0=90=B3=8C=F0=90=B3=91=F0=90=B3=96=F0=90=B3=87?=
 <26771058+KobeArthurScofield@users.noreply.github.com>
Date: Tue, 24 Dec 2024 00:10:55 +0800
Subject: [PATCH] Patch commit message and some tweaking

---
 .github/workflows/release-win7.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release-win7.yml b/.github/workflows/release-win7.yml
index 7c61bf41..63637dec 100644
--- a/.github/workflows/release-win7.yml
+++ b/.github/workflows/release-win7.yml
@@ -41,7 +41,7 @@ jobs:
         run: |
           cd ./src
           . ./all.bash
-          cd ../
+          cd ${{ github.workspace }}
           mkdir -p patched-go
           rsync -a --exclude 'patched-go' ./ 'patched-go'
 
@@ -132,18 +132,18 @@ jobs:
       - name: Download dependencies and build Xray
         run: |
           echo "Setup environment..."
-          export PATH=$PATH:$PWD/patched-go/bin
-          ./patched-go/bin/go version
-          ./patched-go/bin/go env -w GOPATH=$PWD
-          ./patched-go/bin/go env -w GOROOT=$PWD/patched-go
+          export PATH=$PATH:${{ github.workspace }}/patched-go/bin
+          ${{ github.workspace }}/patched-go/bin/go version
+          ${{ github.workspace }}/patched-go/bin/go env -w GOPATH=${{ github.workspace }}
+          ${{ github.workspace }}/patched-go/bin/go env -w GOROOT=${{ github.workspace }}/patched-go
           echo "Download dependencies..."
-          ./patched-go/bin/go mod download
+          ${{ github.workspace }}/patched-go/bin/go mod download
           echo "Build Xray..."
           mkdir -p build_assets
-          ./patched-go/bin/go clean -v -i $PWD
+          ${{ github.workspace }}/patched-go/bin/go clean -v -i $PWD
           rm -f xray xray.exe wxray.exe xray_softfloat
-          ./patched-go/bin/go build -o xray.exe -trimpath -ldflags "-s -w -buildid=" -v ./main
-          ./patched-go/bin/go build -o wxray.exe -trimpath -ldflags "-H windowsgui -s -w -buildid=" -v ./main
+          ${{ github.workspace }}/patched-go/bin/go build -o xray.exe -trimpath -ldflags "-X github.com/xtls/xray-core/core.build=win7-${{ github.ref_name }}-${{ github.sha }} -s -w -buildid=" -v ./main
+          ${{ github.workspace }}/patched-go/bin/go build -o wxray.exe -trimpath -ldflags "-H windowsgui -X github.com/xtls/xray-core/core.build=win7-${{ github.ref_name }}-${{ github.sha }} -s -w -buildid=" -v ./main
           echo "Build completed."
           find . -maxdepth 1 -type f -regex './\(wxray\|xray\).exe' -exec mv {} ./build_assets/ \;