diff --git a/.github/workflows/bn-tests.yml b/.github/workflows/bn-tests.yml deleted file mode 100644 index da26d678..00000000 --- a/.github/workflows/bn-tests.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: CI (BN) - -on: - push: - # TODO: change this - branches: [ binja-ci ] - -jobs: - tests: - name: Tests in ${{ matrix.python-version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-20.04] - # across all operating systems - python-version: ["3.7", "3.11"] - steps: - - name: Checkout capa with submodules - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - with: - submodules: recursive - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4.5.0 - with: - python-version: ${{ matrix.python-version }} - - name: Install pyyaml - run: sudo apt-get install -y libyaml-dev - - name: Install capa - run: pip install -e .[dev] - - - name: install Binary Ninja - env: - BN_SERIAL: ${{ secrets.BN_SERIAL }} - run: | - mkdir ./.github/binja - curl "https://raw.githubusercontent.com/Vector35/binaryninja-api/6812c97/scripts/download_headless.py" -o ./.github/binja/download_headless.py - python ./.github/binja/download_headless.py --serial $BN_SERIAL --output .github/binja/BinaryNinja-headless.zip - unzip .github/binja/BinaryNinja-headless.zip -d .github/binja/ - python .github/binja/binaryninja/scripts/install_api.py --install-on-root --silent - - name: Run tests - env: - BN_LICENSE: ${{ secrets.BN_LICENSE }} - run: pytest --capture=no --log-cli-level=WARN -v tests/test_binja_features.py diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e60eb4e5..6ee5f534 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -90,3 +90,37 @@ jobs: run: pip install -e .[dev] - name: Run tests run: pytest -v tests/ + + binja-tests: + name: Binary Ninja tests for ${{ matrix.python-version }} on ${{ matrix.os }} + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: + python-version: ["3.7", "3.11"] + steps: + - name: Checkout capa with submodules + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + with: + submodules: recursive + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4.5.0 + with: + python-version: ${{ matrix.python-version }} + - name: Install pyyaml + run: sudo apt-get install -y libyaml-dev + - name: Install capa + run: pip install -e .[dev] + - name: install Binary Ninja + env: + BN_SERIAL: ${{ secrets.BN_SERIAL }} + run: | + mkdir ./.github/binja + curl "https://raw.githubusercontent.com/Vector35/binaryninja-api/6812c97/scripts/download_headless.py" -o ./.github/binja/download_headless.py + python ./.github/binja/download_headless.py --serial $BN_SERIAL --output .github/binja/BinaryNinja-headless.zip + unzip .github/binja/BinaryNinja-headless.zip -d .github/binja/ + python .github/binja/binaryninja/scripts/install_api.py --install-on-root --silent + - name: Run tests + env: + BN_LICENSE: ${{ secrets.BN_LICENSE }} + run: pytest -v tests/test_binja_features.py # explicitly refer to the binja tests for performance. other tests run above.