From 0851d458851c6a3de47be4a4fa89bf9f320311b6 Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 11:27:29 +0800 Subject: [PATCH 01/12] remove additional docker test --- .github/workflows/build-ci.yml | 8 ++------ examples/rootfs | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 5cecd78e3..9a702612f 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -73,13 +73,9 @@ jobs: cd ../examples/rootfs/x86_linux/kernel && unzip -P infected m0hamed_rootkit.ko.zip cd ../../../../ pip3 install -e .[RE] + pip3 install poetry + cd tests && ./test_onlinux.sh - if [ ${{ matrix.os }} == 'ubuntu-18.04' ] and [ ${{ matrix.python-version }} == '3.9' ]; then - docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh" - else - pip3 install poetry - cd tests && ./test_onlinux.sh - fi # - name: mac run tests # if: contains(matrix.os, 'macos') diff --git a/examples/rootfs b/examples/rootfs index 6d4d654fd..32c4fcf52 160000 --- a/examples/rootfs +++ b/examples/rootfs @@ -1 +1 @@ -Subproject commit 6d4d654fdc2892490d98c433eca3efa5c6d062c7 +Subproject commit 32c4fcf52f4aa0efaa1cb03ab6b2186c61f512c6 From c9d6ac85428449f86109bd4269d15f8512e82917 Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 11:31:15 +0800 Subject: [PATCH 02/12] sync branch --- examples/rootfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/rootfs b/examples/rootfs index 32c4fcf52..55893d6fb 160000 --- a/examples/rootfs +++ b/examples/rootfs @@ -1 +1 @@ -Subproject commit 32c4fcf52f4aa0efaa1cb03ab6b2186c61f512c6 +Subproject commit 55893d6fb273d1fee42f23500ba049fd5a558f14 From 5a92718b538cb2d4bc55433cc323a16dd29befa6 Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 14:36:13 +0800 Subject: [PATCH 03/12] improve docker --- .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 9a702612f..1fb394a0a 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -11,10 +11,10 @@ jobs: matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] os: [windows-latest, ubuntu-22.04] - python-version: ["3.9", "3.11"] + python-version: ["3.11"] include: - os: ubuntu-22.04 - python-version: 3.9 + python-version: 3.11 container: Docker steps: @@ -72,10 +72,14 @@ jobs: cd ../qiling cd ../examples/rootfs/x86_linux/kernel && unzip -P infected m0hamed_rootkit.ko.zip cd ../../../../ - pip3 install -e .[RE] - pip3 install poetry - cd tests && ./test_onlinux.sh + pip3 install -e . + if [ ${{ matrix.contrainer }} == ${{ matrix.os }} ]; then + docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh" + else + pip3 install poetry + cd tests && ./test_onlinux.sh + fi # - name: mac run tests # if: contains(matrix.os, 'macos') From 2ef749ceec1c98158bb40fc77682376fa35db133 Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 14:43:53 +0800 Subject: [PATCH 04/12] sync branch --- .github/workflows/build-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 1fb394a0a..ba1d3aaa3 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -11,11 +11,11 @@ jobs: matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] os: [windows-latest, ubuntu-22.04] - python-version: ["3.11"] + python-version: ["3.9", "3.11"] include: - os: ubuntu-22.04 python-version: 3.11 - container: Docker + #container: Docker steps: - uses: actions/checkout@v3 @@ -74,7 +74,7 @@ jobs: cd ../../../../ pip3 install -e . - if [ ${{ matrix.contrainer }} == ${{ matrix.os }} ]; then + if [ ${{ matrix.contrainer }} != "" ]; then docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh" else pip3 install poetry From ed52252d3e3a89885364ad34247300afdfe685ed Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 14:46:51 +0800 Subject: [PATCH 05/12] keep as 3.11 --- .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 ba1d3aaa3..ede11668f 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -11,7 +11,7 @@ jobs: matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] os: [windows-latest, ubuntu-22.04] - python-version: ["3.9", "3.11"] + python-version: ["3.11"] include: - os: ubuntu-22.04 python-version: 3.11 From 5d67393a05a7a595991fa7b03c4df24bb6ad038f Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 14:59:59 +0800 Subject: [PATCH 06/12] add docker --- .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 ede11668f..9c2fa148a 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -15,7 +15,7 @@ jobs: include: - os: ubuntu-22.04 python-version: 3.11 - #container: Docker + container: Docker steps: - uses: actions/checkout@v3 From caff266aebdd3e8dac861b09c678ca38a87d0d7a Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 15:05:21 +0800 Subject: [PATCH 07/12] remove docker test --- .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 9c2fa148a..ede11668f 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -15,7 +15,7 @@ jobs: include: - os: ubuntu-22.04 python-version: 3.11 - container: Docker + #container: Docker steps: - uses: actions/checkout@v3 From e2559a7727429d0d4e821438f5bedb5d0399b23f Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 15:06:50 +0800 Subject: [PATCH 08/12] remove docker test --- .github/workflows/build-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index ede11668f..34e32e656 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -13,9 +13,9 @@ jobs: os: [windows-latest, ubuntu-22.04] python-version: ["3.11"] include: - - os: ubuntu-22.04 - python-version: 3.11 - #container: Docker + - #os: ubuntu-22.04 + #python-version: 3.11 + container: Docker steps: - uses: actions/checkout@v3 From 7786658ad9693c8ae4400efed7a6e53d3d2a98ac Mon Sep 17 00:00:00 2001 From: xwings Date: Tue, 1 Apr 2025 15:09:32 +0800 Subject: [PATCH 09/12] remove docker test --- .github/workflows/build-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 34e32e656..b90a860e4 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -12,10 +12,10 @@ jobs: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] os: [windows-latest, ubuntu-22.04] python-version: ["3.11"] - include: - - #os: ubuntu-22.04 + #include: + #- os: ubuntu-22.04 #python-version: 3.11 - container: Docker + #container: Docker steps: - uses: actions/checkout@v3 From 20a7f68f0461430888677575178ef051a29357d5 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 17:12:09 +0800 Subject: [PATCH 10/12] sync rootfs --- examples/rootfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/rootfs b/examples/rootfs index 55893d6fb..f71f45fe1 160000 --- a/examples/rootfs +++ b/examples/rootfs @@ -1 +1 @@ -Subproject commit 55893d6fb273d1fee42f23500ba049fd5a558f14 +Subproject commit f71f45fe1a39d58d8b8cae717f55cebeb37f63c7 From 93c7bc29d17b08fe28c135debed7af5b82bacf32 Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 17:26:18 +0800 Subject: [PATCH 11/12] remove docker test --- .github/workflows/build-ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index b90a860e4..4d557f571 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -11,7 +11,7 @@ jobs: matrix: #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04] os: [windows-latest, ubuntu-22.04] - python-version: ["3.11"] + python-version: ["3.9", "3.11"] #include: #- os: ubuntu-22.04 #python-version: 3.11 @@ -73,12 +73,7 @@ jobs: cd ../examples/rootfs/x86_linux/kernel && unzip -P infected m0hamed_rootkit.ko.zip cd ../../../../ pip3 install -e . - - if [ ${{ matrix.contrainer }} != "" ]; then - docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh" - else - pip3 install poetry - cd tests && ./test_onlinux.sh + cd tests && ./test_onlinux.sh fi # - name: mac run tests From d8dad957d34805af5650453804247dd672acdd2e Mon Sep 17 00:00:00 2001 From: xwings Date: Sun, 13 Apr 2025 17:35:29 +0800 Subject: [PATCH 12/12] ci syntax --- .github/workflows/build-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 4d557f571..d20b03754 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -74,7 +74,6 @@ jobs: cd ../../../../ pip3 install -e . cd tests && ./test_onlinux.sh - fi # - name: mac run tests # if: contains(matrix.os, 'macos')