From 8b2b8621aaabd19d25bb29d9078f2516339036e4 Mon Sep 17 00:00:00 2001 From: kabeor Date: Sat, 15 Oct 2022 00:40:51 +0800 Subject: [PATCH 1/4] update build docker for ci --- .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 b99967ffc..7caadbefe 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -79,7 +79,7 @@ jobs: cd ../../../../ pip3 install -e .[evm,RE] - if [ ${{ matrix.os }} == 'ubuntu-20.04' ] and [ ${{ matrix.python-version }} == '3.9' ]; then + if [ ${{ matrix.container }} == 'Docker' ]; then docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh" else pip3 install setuptools wheel From 0852c946293e264169d2a6b7da8289453047bc70 Mon Sep 17 00:00:00 2001 From: kabeor Date: Sat, 15 Oct 2022 01:11:14 +0800 Subject: [PATCH 2/4] update build docker for ci --- .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 7caadbefe..69724718c 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -13,15 +13,15 @@ jobs: os: [windows-latest, ubuntu-20.04] python-version: [3.8, 3.9] include: - - os: ubuntu-20.04 + - os: ubuntu-18.04 python-version: 3.9 container: Docker steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} From 46f7bd796f3206001e3f553796b7de0cd3946d77 Mon Sep 17 00:00:00 2001 From: kabeor Date: Sat, 15 Oct 2022 01:37:28 +0800 Subject: [PATCH 3/4] update build docker for ci --- .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 69724718c..3c3348b04 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -13,7 +13,7 @@ jobs: os: [windows-latest, ubuntu-20.04] python-version: [3.8, 3.9] include: - - os: ubuntu-18.04 + - os: ubuntu-20.04 python-version: 3.9 container: Docker From 0d50059447c6eeae625a2d9ebb508e8894c509df Mon Sep 17 00:00:00 2001 From: kabeor Date: Sat, 15 Oct 2022 01:48:08 +0800 Subject: [PATCH 4/4] update docker ci --- .github/workflows/build-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 3c3348b04..6ab9b2bf3 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -13,7 +13,7 @@ jobs: os: [windows-latest, ubuntu-20.04] python-version: [3.8, 3.9] include: - - os: ubuntu-20.04 + - os: ubuntu-18.04 python-version: 3.9 container: Docker @@ -79,7 +79,7 @@ jobs: cd ../../../../ pip3 install -e .[evm,RE] - if [ ${{ matrix.container }} == 'Docker' ]; then + 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 setuptools wheel