diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index 36d38c8f45..8aa44c7d5f 100644 --- a/.github/workflows/release_main.yml +++ b/.github/workflows/release_main.yml @@ -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/action-upload-artifacts-and-release-assets@v1.8 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] @@ -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