Skip to content

Commit

Permalink
ci(release_main.yml): Fix upgrading v2ray core build
Browse files Browse the repository at this point in the history
  • Loading branch information
Markson Hon committed Dec 10, 2023
1 parent 7eb931d commit d988e3a
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions .github/workflows/release_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -574,12 +574,19 @@ jobs:
$source_dir/geoip.dat=/usr/share/xray/geoip.dat \
$source_dir/geosite.dat=/usr/share/xray/geosite.dat
done
- name: Note Version Number
run: |
echo "V2RAY_VERSION=$V2RAY_VERSION" >> ./v2ray_packages_version.txt
echo "XRAY_VERSION=$XRAY_VERSION" >> ./xray_packages_version.txt
- name: Upload Artifact
uses: nanoufo/[email protected]
with:
path: |
v2ray_packages/*
xray_packages/*
v2ray_packages_version.txt
xray_packages_version.txt
Build_APT_Repository_and_AUR:
runs-on: ubuntu-22.04
needs: [Build_v2rayA_Binaries, Build_Linux_Packages, Build_v2ray_Debian_Packages]
Expand All @@ -603,16 +610,15 @@ jobs:
- name: Prepare Builds
run: |
sudo apt install -y lintian reprepro gnupg gnupg2 expect >> /dev/null
mkdir -p install/debian
for deb_package in $(ls builds | grep .deb); do
mv builds/"$deb_package"/"$deb_package" ./"$deb_package"
done
for v2raya_bin in $(ls builds | grep -E "^v2raya_linux"); do
mv builds/"$v2raya_bin"/"$v2raya_bin" ./"$v2raya_bin"
done
mv builds/v2raya_linux* ./
mv builds/web.tar.gz/web.tar.gz ./web.tar.gz
v2ray_version="$(ls | grep "^v2ray_" | grep amd64 | awk -F '_' '{print $3}' | sed 's/.deb//')"
xray_version="$(ls | grep "^xray_" | grep amd64 | awk -F '_' '{print $3}' | sed 's/.deb//')"
v2ray_version="$(cat builds/v2ray_packages_version.txt)"
echo "v2ray core version: $v2ray_version"
xray_version="$(cat builds/xray_packages_version.txt)"
echo "xray core version: $xray_version"
mv builds/v2ray_*_$v2ray_version.deb ./
mv builds/xray_*_$xray_version.deb ./
ls -lh ./
echo "V2RAY_VERSION=$v2ray_version" >> $GITHUB_OUTPUT
echo "XRAY_VERSION=$xray_version" >> $GITHUB_OUTPUT
echo "V2RAY_VERSION=$v2ray_version" >> $GITHUB_ENV
Expand Down

0 comments on commit d988e3a

Please sign in to comment.