diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bfefab3..f6c22781 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,10 @@ on: jobs: ci: uses: angr/ci-settings/.github/workflows/angr-ci.yml@master + windows: + uses: .github/workflows/windows.yml + macos: + uses: .github/workflows/macos.yml docs: runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 00000000..900c5718 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,37 @@ +name: Test on macOS + +on: + workflow_dispatch: + workflow_call: + +jobs: + macos: + name: Test macOS + runs-on: macos-12 + steps: + - uses: actions/checkout@v3 + with: + path: pyvex + submodules: true + - uses: actions/checkout@v3 + with: + repository: angr/binaries + path: binaries + - uses: actions/setup-python@v4 + with: + python-version: "3.8" + - run: python -m venv $HOME/venv + name: Create venv + shell: bash + - run: | + source $HOME/venv/bin/activate + pip install git+https://github.com/angr/archinfo.git + name: Install dependencies + - run: | + source $HOME/venv/bin/activate + pip install ./pyvex[testing] + name: Install + - run: | + source $HOME/venv/bin/activate + pytest -n auto pyvex + name: Run pytest diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml deleted file mode 100644 index 86cd6c59..00000000 --- a/.github/workflows/smoketest.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Install Smoketest - -on: - push: - branches: - - master - pull_request: - workflow_dispatch: - -jobs: - windows: - name: Test Windows installation - runs-on: windows-2022 - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - uses: actions/setup-python@v4 - with: - python-version: "3.8" - - run: python -m venv $HOME\venv - name: Create venv - - run: | - call %USERPROFILE%\venv\Scripts\activate - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - pip install git+https://github.com/angr/archinfo.git - name: Install dependencies - shell: cmd - - run: | - call %USERPROFILE%\venv\Scripts\activate - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - pip install . - name: Install pyvex - shell: cmd - - run: | - call %USERPROFILE%\venv\Scripts\activate - cd \ - python -c "import pyvex; print('It works!')" - name: Import pyvex - shell: cmd - - macos: - name: Test macOS installation - runs-on: macos-12 - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - uses: actions/setup-python@v4 - with: - python-version: "3.8" - - run: python -m venv $HOME/venv - name: Create venv - shell: bash - - run: | - source $HOME/venv/bin/activate - pip install git+https://github.com/angr/archinfo.git - name: Install dependencies - - run: | - source $HOME/venv/bin/activate - pip install . - name: Install pyvex - - run: | - source $HOME/venv/bin/activate - python -c "import pyvex; print('It works!')" - name: Import pyvex diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 00000000..59397669 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,41 @@ +name: Test on Windows + +on: + push: + workflow_dispatch: + workflow_call: + +jobs: + windows: + name: Test Windows + runs-on: windows-2022 + steps: + - uses: actions/checkout@v3 + with: + path: pyvex + - uses: actions/checkout@v3 + with: + repository: angr/binaries + path: binaries + - uses: actions/setup-python@v4 + with: + python-version: "3.8" + - run: python -m venv $HOME/venv + name: Create venv + shell: bash + - run: | + call %USERPROFILE%\venv\Scripts\activate + pip install git+https://github.com/angr/archinfo.git + name: Install dependencies + shell: cmd + - run: | + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call %USERPROFILE%\venv\Scripts\activate + pip install ./pyvex[testing] + name: Install + shell: cmd + - run: | + call %USERPROFILE%\venv\Scripts\activate + pytest -n auto pyvex + name: Run pytest + shell: cmd diff --git a/setup.cfg b/setup.cfg index 4638297a..a5fd45ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,6 +33,8 @@ docs = myst-parser sphinx sphinx-autodoc-typehints +testing = + pytest [options.package_data] pyvex =