Skip to content

Commit 3f22350

Browse files
committed
you know what, I yield
1 parent 973b9c2 commit 3f22350

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

.github/workflows/test-opencvsharp.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- { os: rhel.9, arch: x64, runs-on: ubuntu-22.04, image: oraclelinux:9 }
3636
- { os: rhel.9, arch: arm64, runs-on: ubuntu-22.04-arm, image: oraclelinux:9 }
3737
- { os: android, arch: arm64, runs-on: ubuntu-24.04 }
38-
- { os: android, arch: x64, runs-on: ubuntu-22.04 }
38+
- { os: android, arch: x64, runs-on: ubuntu-24.04 }
3939

4040
steps:
4141
- name: Download OpenCvSharp Artifacts
@@ -214,26 +214,9 @@ jobs:
214214
cp -r opencvsharp/lib/* test
215215
216216
- name: Run Test
217-
if: matrix.os != 'android' || matrix.arch != 'x64'
217+
if: matrix.os != 'android'
218218
run: |
219-
if [[ "${{ matrix.os }}" == "android" && "${{ matrix.arch }}" == "arm64" ]]; then
220-
echo "::group::Running on Android ARM64"
221-
sudo apt install adb
222-
sudo apt install linux-modules-extra-`uname -r`
223-
sudo modprobe binder_linux devices="binder,hwbinder,vndbinder"
224-
sudo modprobe ashmem_linux
225-
echo "::endgroup::"
226-
227-
docker run -d --rm --privileged -p 5555:5555 -v "$PWD":${{ github.workspace }} -w ${{ github.workspace }} redroid/redroid
228-
until adb connect localhost:5555; do
229-
echo "ReDroid ADB not ready, retrying..."
230-
sleep 2
231-
done
232-
adb wait-for-device
233-
adb devices -l
234-
adb push -a test /data/local/tmp/
235-
adb shell 'cd /data/local/tmp/test && ./test.exe'
236-
elif [[ "${{ matrix.image }}" != "" ]]; then
219+
if [[ "${{ matrix.image }}" != "" ]]; then
237220
docker run -d --name runner -v "$PWD":${{ github.workspace }} -w ${{ github.workspace }} ${{ matrix.image }} bash -c "cd test && ./test.exe"
238221
else
239222
cd test && ./test.exe

0 commit comments

Comments
 (0)