From 92dd89326b34f4dc23fa96e9a3d7b8823a93f4cf Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 15:49:32 -0800 Subject: [PATCH 1/8] Set up build matrix for python 2.7, 3.6, 3.7 --- .github/workflows/pythonapp.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index a8c6c5b226..ad8b84aaa4 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -6,13 +6,15 @@ jobs: build: runs-on: ubuntu-latest - + strategy: + matrix: + python: [2.7, 3.6, 3.7] steps: - uses: actions/checkout@v1 - - name: Set up Python 3.7 + - name: Set up Python uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: ${{ matrix.python }} - name: Install dependencies run: | python -m pip install --upgrade pip From 2f3016ed5dc54bb00ddacd741d898dd2f0b2589c Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 15:52:04 -0800 Subject: [PATCH 2/8] Set up build matrix for python 3.6, 3.7 --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index ad8b84aaa4..886079d9b9 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [2.7, 3.6, 3.7] + python: [3.6, 3.7] steps: - uses: actions/checkout@v1 - name: Set up Python From 4d602b0cb4cb2093b86752425cef39966c81b623 Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 15:58:24 -0800 Subject: [PATCH 3/8] Add windows to build matrix --- .github/workflows/pythonapp.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 886079d9b9..f0727fccb9 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -5,9 +5,10 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ubuntu-latest, windows-latest] python: [3.6, 3.7] steps: - uses: actions/checkout@v1 From 7fc885fcc843652898e023e794eb2987411ecf28 Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 17:12:21 -0800 Subject: [PATCH 4/8] Separate out black check --- .github/workflows/pythonapp.yml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index f0727fccb9..e9bac72518 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -3,13 +3,32 @@ name: cve-bin-tool on: [push, pull_request] jobs: + black_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Lint with black + run: | + pip install black + black --check cve_bin_tool/ + black --check test/ + build: runs-on: ${{ matrix.os }} strategy: matrix: os: [ubuntu-latest, windows-latest] - python: [3.6, 3.7] + python: [2.7, 3.6, 3.7] + fail-fast: false steps: - uses: actions/checkout@v1 - name: Set up Python @@ -20,11 +39,6 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - - name: Lint with black - run: | - pip install black - black --check cve_bin_tool/ - black --check test/ - name: Run tests run: | ACTIONS=1 python setup.py test From 6323ff51176ade0d4bd5f81456e3014074650ef2 Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 17:14:03 -0800 Subject: [PATCH 5/8] fix workflow error --- .github/workflows/pythonapp.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e9bac72518..6a525ff41e 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -3,7 +3,7 @@ name: cve-bin-tool on: [push, pull_request] jobs: - black_check: + check: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -27,8 +27,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python: [2.7, 3.6, 3.7] - fail-fast: false + python: [3.6, 3.7] steps: - uses: actions/checkout@v1 - name: Set up Python From daec506ecad64b60e627a7cbc21fe2b5520424ef Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 17:19:51 -0800 Subject: [PATCH 6/8] Move black check to bottom --- .github/workflows/pythonapp.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 6a525ff41e..8097819903 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -3,23 +3,6 @@ name: cve-bin-tool on: [push, pull_request] jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Lint with black - run: | - pip install black - black --check cve_bin_tool/ - black --check test/ build: @@ -41,3 +24,18 @@ jobs: - name: Run tests run: | ACTIONS=1 python setup.py test + + black_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: Lint with black + run: | + pip install black + black --check cve_bin_tool/ + black --check test/ + From bd415becc8edf5ec66dcf1cbcfb9037b1e4b9259 Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 19 Nov 2019 17:20:43 -0800 Subject: [PATCH 7/8] Move black check to bottom --- .github/workflows/pythonapp.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 8097819903..86adfa0651 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -24,15 +24,6 @@ jobs: - name: Run tests run: | ACTIONS=1 python setup.py test - - black_check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python - uses: actions/setup-python@v1 - with: - python-version: 3.7 - name: Lint with black run: | pip install black From 53856945165d381f2995b3e0e2d61f346b76977c Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Wed, 20 Nov 2019 10:23:26 -0800 Subject: [PATCH 8/8] revert to ubuntu-only --- .github/workflows/pythonapp.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 86adfa0651..5d6f7da451 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -3,13 +3,12 @@ name: cve-bin-tool on: [push, pull_request] jobs: - build: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] python: [3.6, 3.7] steps: - uses: actions/checkout@v1 @@ -21,12 +20,11 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - - name: Run tests - run: | - ACTIONS=1 python setup.py test - name: Lint with black run: | pip install black black --check cve_bin_tool/ black --check test/ - + - name: Run tests + run: | + ACTIONS=1 python setup.py test