TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-23 00:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
topjohnwu 2024-07-20 04:52:25 -07:00
parent 054971e899
commit f919bb0e99
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -162,7 +162,7 @@ jobs:
run: scripts/avd_test.sh ${{ matrix.version }} run: scripts/avd_test.sh ${{ matrix.version }}
cf_test: cf_test:
name: Test on AOSP main Cuttlefish name: Test Cuttlefish on main
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
env: env:
CF_HOME: /home/runner/aosp_cf_x86_64_phone CF_HOME: /home/runner/aosp_cf_x86_64_phone
@ -186,7 +186,7 @@ jobs:
with: with:
ref: ${{ github.ref }} ref: ${{ github.ref }}
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
check-name: 'Build Magisk artifacts' check-name: "Build Magisk artifacts"
- name: Download build artifacts - name: Download build artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4

2
scripts/avd_test.sh
View File

@ -82,7 +82,7 @@ test_emu() {
# Install LSPosed # Install LSPosed
if [ $api -ge $lsposed_min_api -a $api -le $atd_max_api ]; then if [ $api -ge $lsposed_min_api -a $api -le $atd_max_api ]; then
adb push out/lsposed.zip /data/local/tmp/lsposed.zip adb push out/lsposed.zip /data/local/tmp/lsposed.zip
adb shell echo 'PATH=$PATH:/debug_ramdisk magisk --install-module /data/local/tmp/lsposed.zip' \| /system/xbin/su echo 'PATH=$PATH:/debug_ramdisk magisk --install-module /data/local/tmp/lsposed.zip' | adb shell /system/xbin/su
fi fi
adb reboot adb reboot

2
scripts/cuttlefish.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
cvd_args='-daemon -enable_sandbox=false -report_anonymous_usage_stats=n' cvd_args='-daemon -enable_sandbox=false -memory_mb=8192 -report_anonymous_usage_stats=n'
magisk_args='-init_boot_image=magisk_patched.img' magisk_args='-init_boot_image=magisk_patched.img'
cleanup() { cleanup() {

4
scripts/test_common.sh
View File

@ -13,7 +13,7 @@ print_error() {
run_content_cmd() { run_content_cmd() {
while true; do while true; do
local out=$(adb shell echo "'content call --uri content://com.topjohnwu.magisk.provider --method $1'" \| /system/xbin/su | tee /dev/fd/2) local out=$(echo "content call --uri content://com.topjohnwu.magisk.provider --method $1" | adb shell /system/xbin/su | tee /dev/fd/2)
if ! grep -q 'Bundle\[' <<< "$out"; then if ! grep -q 'Bundle\[' <<< "$out"; then
# The call failed, wait a while and retry later # The call failed, wait a while and retry later
sleep 30 sleep 30
@ -38,5 +38,5 @@ test_setup() {
test_app() { test_app() {
# Run app tests # Run app tests
run_content_cmd test run_content_cmd test
adb shell echo 'su -c id' \| /system/xbin/su 2000 | tee /dev/fd/2 | grep -q 'uid=0' echo 'su -c id' | adb shell /system/xbin/su 2000 | tee /dev/fd/2 | grep -q 'uid=0'
} }