Merge pull request #491 from fireeye/williballenthin-patch-3

This commit is contained in:
Ana María Martínez Gómez
2021-03-22 19:16:49 +01:00
committed by GitHub
3 changed files with 9 additions and 10 deletions

View File

@@ -15,10 +15,10 @@ jobs:
# use old linux so that the shared library versioning is more portable
artifact_name: capa
asset_name: linux
- os: windows-latest
- os: windows-2019
artifact_name: capa.exe
asset_name: windows
- os: macos-latest
- os: macos-10.15
artifact_name: capa
asset_name: macos
steps:
@@ -30,7 +30,7 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: 3.9
- if: matrix.os == 'ubuntu-latest'
- if: matrix.os == 'ubuntu-16.04'
run: sudo apt-get install -y libyaml-dev
- name: Install PyInstaller
run: pip install 'pyinstaller==4.2'
@@ -47,7 +47,7 @@ jobs:
zip:
name: zip ${{ matrix.asset_name }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
needs: build
strategy:
matrix:

View File

@@ -9,7 +9,7 @@ on:
jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up Python
@@ -26,4 +26,4 @@ jobs:
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload --skip-existing dist/*
twine upload --skip-existing dist/*

View File

@@ -8,7 +8,7 @@ on:
jobs:
code_style:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout capa
uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
run: black -l 120 --check .
rule_linter:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout capa with rules submodule
uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
tests:
name: Tests in ${{ matrix.python }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
needs: [code_style, rule_linter]
strategy:
fail-fast: false
@@ -67,4 +67,3 @@ jobs:
run: pip install -e .[dev]
- name: Run tests
run: pytest tests/