github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add unbuilt v2ray to updater-v2ray-v5.39.0 — v2ray → v5.39.0 (#12956)

Browse Source 
* Add unbuilt v2ray to updater-v2ray-v5.39.0

* Update workflows to use M140 containers; Update build_updated_packages.rb to force hash updates during installs.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* updater-v2ray-v5.39.0: Package File Update Run on linux/386 container.

* Set PRs to draft if workflows are running on them.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Check if CI variable is set when starting container operations.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Gate crew reinstall usage of '-f' behind CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* updater-v2ray-v5.39.0: Package File Update Run on linux/arm/v7 container.

---------

Signed-off-by: Satadru Pramanik <satadru@gmail.com>
Co-authored-by: satmandu <satmandu@users.noreply.github.com>
Co-authored-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
chromebrew-actions[bot]
2025-09-26 12:18:00 -05:00
committed by GitHub
parent febe8a5266
commit b4cf1dfdbc
9 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/Build.yml vendored
View File

@@ -66,6 +66,16 @@ jobs:
fetch-depth: 0 fetch-depth: 0
persist-credentials: true persist-credentials: true
ref: ${{ inputs.branch || github.ref_name }} ref: ${{ inputs.branch || github.ref_name }}
- name: Set PR to Draft
id: set-to-draft
env:
GH_TOKEN: ${{ secrets.CREW_PR_TOKEN }}
run: |
PR_NUMBER=$(gh pr list -L 1 -s open -H ${{ inputs.branch || github.ref_name }} | cut -f1)
if [[ -n ${PR_NUMBER} ]]; then
echo "Setting ${PR_NUMBER} to Draft while workflow runs."
gh pr ready --undo || true
fi
- name: Set Timestamp - name: Set Timestamp
id: set-timestamp id: set-timestamp
run: | run: |
@@ -208,7 +218,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
fi fi
@@ -220,7 +230,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
fi fi
@@ -238,6 +248,7 @@ jobs:
id: run-updater id: run-updater
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
run: | run: |
[[ -n ${CI} ]] && echo 'CI variable is set.'
if [ "$PLATFORM" == 'linux/arm/v7' ] && [ -z "${armv7l_PACKAGES}" ]; then if [ "$PLATFORM" == 'linux/arm/v7' ] && [ -z "${armv7l_PACKAGES}" ]; then
# Exit the arm container if there are not armv7l compatible packages. # Exit the arm container if there are not armv7l compatible packages.
echo "Skipping armv7l container builds &/or package file updates" echo "Skipping armv7l container builds &/or package file updates"

15
.github/workflows/Generate-PR.yml vendored
View File

@@ -61,6 +61,16 @@ jobs:
fetch-depth: 0 fetch-depth: 0
persist-credentials: true persist-credentials: true
ref: ${{ inputs.branch || github.ref_name }} ref: ${{ inputs.branch || github.ref_name }}
- name: Set PR to Draft
id: set-to-draft
env:
GH_TOKEN: ${{ secrets.CREW_PR_TOKEN }}
run: |
PR_NUMBER=$(gh pr list -L 1 -s open -H ${{ inputs.branch || github.ref_name }} | cut -f1)
if [[ -n ${PR_NUMBER} ]]; then
echo "Setting ${PR_NUMBER} to Draft while workflow runs."
gh pr ready --undo || true
fi
- name: Get changed files - name: Get changed files
id: changed-files id: changed-files
uses: tj-actions/changed-files@v47 uses: tj-actions/changed-files@v47
@@ -194,7 +204,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
fi fi
@@ -206,7 +216,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
fi fi
@@ -227,6 +237,7 @@ jobs:
UPDATE_PACKAGE_FILES: ${{ github.event.inputs.update_package_files }} UPDATE_PACKAGE_FILES: ${{ github.event.inputs.update_package_files }}
run: | run: |
[[ "$UPDATE_PACKAGE_FILES" == 'false' ]] && exit 0 [[ "$UPDATE_PACKAGE_FILES" == 'false' ]] && exit 0
[[ -n ${CI} ]] && echo 'CI variable is set.'
if [ "$PLATFORM" == 'linux/arm/v7' ] && [ -z "${armv7l_PACKAGES}" ]; then if [ "$PLATFORM" == 'linux/arm/v7' ] && [ -z "${armv7l_PACKAGES}" ]; then
# Exit the arm container if there are not armv7l compatible packages. # Exit the arm container if there are not armv7l compatible packages.
echo "Skipping armv7l container builds &/or package file updates." echo "Skipping armv7l container builds &/or package file updates."

4
.github/workflows/No-Compile-Needed.yml vendored
View File

@@ -223,7 +223,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
fi fi
@@ -235,7 +235,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
fi fi

4
.github/workflows/Unit-Test.yml vendored
View File

@@ -138,7 +138,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
fi fi
@@ -150,7 +150,7 @@ jobs:
if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m139" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m140" >> "$GITHUB_ENV"
else else
echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV" echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
fi fi

12
manifest/armv7l/v/v2ray.filelist Normal file
View File

@@ -0,0 +1,12 @@
# Total size: 54930826
/usr/local/bin/v2ray
/usr/local/etc/v2ray/config.json
/usr/local/share/v2ray/config.json
/usr/local/share/v2ray/geoip-only-cn-private.dat
/usr/local/share/v2ray/geoip.dat
/usr/local/share/v2ray/geosite.dat
/usr/local/share/v2ray/systemd/system/v2ray.service
/usr/local/share/v2ray/systemd/system/v2ray@.service
/usr/local/share/v2ray/v2ray
/usr/local/share/v2ray/vpoint_socks_vmess.json
/usr/local/share/v2ray/vpoint_vmess_freedom.json

1
manifest/i686/v/v2ray.filelist
View File

@@ -1,3 +1,4 @@
# Total size: 54902154
/usr/local/bin/v2ray /usr/local/bin/v2ray
/usr/local/etc/v2ray/config.json /usr/local/etc/v2ray/config.json
/usr/local/share/v2ray/config.json /usr/local/share/v2ray/config.json

1
manifest/x86_64/v/v2ray.filelist
View File

@@ -1,3 +1,4 @@
# Total size: 57896330
/usr/local/bin/v2ray /usr/local/bin/v2ray
/usr/local/etc/v2ray/config.json /usr/local/etc/v2ray/config.json
/usr/local/share/v2ray/config.json /usr/local/share/v2ray/config.json

10
packages/v2ray.rb
View File

@@ -3,7 +3,7 @@ require 'package'
class V2ray < Package class V2ray < Package
description 'A platform for building proxies to bypass network restrictions.' description 'A platform for building proxies to bypass network restrictions.'
homepage 'www.v2fly.org' homepage 'www.v2fly.org'
version 'v5.16.1' version 'v5.39.0'
license 'MIT' license 'MIT'
compatibility 'all' compatibility 'all'
@@ -14,10 +14,10 @@ class V2ray < Package
x86_64: "https://github.com/v2fly/v2ray-core/releases/download/#{version}/v2ray-linux-64.zip" x86_64: "https://github.com/v2fly/v2ray-core/releases/download/#{version}/v2ray-linux-64.zip"
}) })
source_sha256({ source_sha256({
aarch64: '7d3380b9080abc42dae5efa37a15413f4df2b6b645a992c5046d7d53a16ab876', aarch64: 'dcf53be54ba0f3f481e7e13eb6f9d51bd2bbbff6b76daf29f73f22d79d21ff04',
armv7l: '7d3380b9080abc42dae5efa37a15413f4df2b6b645a992c5046d7d53a16ab876', armv7l: 'dcf53be54ba0f3f481e7e13eb6f9d51bd2bbbff6b76daf29f73f22d79d21ff04',
i686: 'efbe54462b11f27343da1a2585cc762944180b524f8f31d911b0e6bdc0cd33a8', i686: '9fb36d15e8cb9c02217909f39d21e4626baeae8c08609e81ffd50f07049c4b2f',
x86_64: '82a7bf0b37ce2fda36d9e0040d71a494170026841735e20d708717b99ca0fe9b' x86_64: '793f7e75a6fd2bfd03076253a7a4d58f05beb059e6fc0519ec5c0c2677fabe20'
}) })
no_compile_needed no_compile_needed

12
tools/build_updated_packages.rb
View File

@@ -1,5 +1,5 @@
#!/usr/local/bin/ruby #!/usr/local/bin/ruby
# build_updated_packages version 3.3 (for Chromebrew) # build_updated_packages version 3.4 (for Chromebrew)
# This updates the versions in python pip packages by calling # This updates the versions in python pip packages by calling
# tools/update_python_pip_packages.rb, checks for updated ruby packages # tools/update_python_pip_packages.rb, checks for updated ruby packages
# by calling tools/update_ruby_gem_packages.rb, and then checks if any # by calling tools/update_ruby_gem_packages.rb, and then checks if any
@@ -82,7 +82,9 @@ def update_hashes(name = nil)
# Add build hashes. # Add build hashes.
system "crew update_package_file #{name}" unless remote_binary.values.all?(nil) system "crew update_package_file #{name}" unless remote_binary.values.all?(nil)
# Add manifests if we are in the right architecture. # Add manifests if we are in the right architecture.
FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist" if system("yes | crew reinstall #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist") # Using crew reinstall -f package here updates the hashes for
# binaries.
FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist" if system("yes | crew reinstall #{'-f' unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES} #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist")
end end
end end
@@ -137,9 +139,11 @@ updated_packages.each do |pkg|
puts "#{name.capitalize} #{@pkg_obj.version} has no binaries and may not need them.".lightgreen puts "#{name.capitalize} #{@pkg_obj.version} has no binaries and may not need them.".lightgreen
next pkg next pkg
elsif @pkg_obj.no_compile_needed? elsif @pkg_obj.no_compile_needed?
system "yes | crew reinstall #{name}" # Using crew reinstall -f package here updates the hashes for
# binaries.
system "yes | crew reinstall #{'-f' unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES} #{name}"
# Add manifests if we are in the right architecture. # Add manifests if we are in the right architecture.
FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist" if system("yes | crew reinstall #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist") FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist" if system("yes | crew reinstall #{'-f' unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES} #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist")
else else
if @pkg_obj.no_binaries_needed? if @pkg_obj.no_binaries_needed?
updated_packages.delete(pkg) updated_packages.delete(pkg)