From 38313de6a893789eb3be516c00b180cd3d6964b5 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 17:56:23 +0800 Subject: [PATCH 1/5] fix docker failure --- .github/workflows/build-ci.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index d20b03754..08f87b4a9 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -12,10 +12,9 @@ jobs: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] os: [windows-latest, ubuntu-22.04] python-version: ["3.9", "3.11"] - #include: - #- os: ubuntu-22.04 - #python-version: 3.11 - #container: Docker + include: + - os: ubuntu-22.04 + container: Docker steps: - uses: actions/checkout@v3 @@ -73,7 +72,12 @@ jobs: cd ../examples/rootfs/x86_linux/kernel && unzip -P infected m0hamed_rootkit.ko.zip cd ../../../../ pip3 install -e . - cd tests && ./test_onlinux.sh + pip3 install poetry + if [ ${{ matrix.contrainer }} != "" ]; then + docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh" + else + cd tests && ./test_onlinux.sh + fi # - name: mac run tests # if: contains(matrix.os, 'macos') From 10d31189d6c0571b0114fa1631686ab7ed58b971 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 18:04:33 +0800 Subject: [PATCH 2/5] add in ubuntu latest --- .github/workflows/build-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 08f87b4a9..3540f2276 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -10,10 +10,11 @@ jobs: fail-fast: false matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] - os: [windows-latest, ubuntu-22.04] + os: [windows-latest, ubuntu-latest, ubuntu-22.04] python-version: ["3.9", "3.11"] include: - os: ubuntu-22.04 + python-version: 3.9 container: Docker steps: From c9d63c50c8707bcd775fda761bb9ef8c73bd0f22 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 18:06:20 +0800 Subject: [PATCH 3/5] fix ubuntu version --- .github/workflows/build-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 3540f2276..75f7100a0 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] - os: [windows-latest, ubuntu-latest, ubuntu-22.04] + os: [windows-latest, ubuntu-22.04] python-version: ["3.9", "3.11"] include: - os: ubuntu-22.04 From e13f90aa89ef838e7cc60b70d43089cf8747dde0 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 18:07:39 +0800 Subject: [PATCH 4/5] fix ubuntu version --- .github/workflows/build-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 75f7100a0..aa56b3b8f 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] - os: [windows-latest, ubuntu-22.04] + os: [windows-latest, ubuntu-latest] python-version: ["3.9", "3.11"] include: - os: ubuntu-22.04 From d425f8f04c7d2252bcc4cd12193a76f8413c4ef6 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 18:08:27 +0800 Subject: [PATCH 5/5] fix ubuntu version --- .github/workflows/build-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index aa56b3b8f..b8a5d3cbd 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -13,7 +13,7 @@ jobs: os: [windows-latest, ubuntu-latest] python-version: ["3.9", "3.11"] include: - - os: ubuntu-22.04 + - os: ubuntu-latest python-version: 3.9 container: Docker