From 32e5a96500e46cc2240fdcc2ad7d9ee1230a49ab Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 22 Aug 2021 17:51:06 -0700 Subject: [PATCH 1/3] remove xml support --- .github/workflows/test.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 250f39d66..c25f4b326 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,17 +8,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: install dependencies + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '2.7' + - name: Install dependencies run: | - sudo apt-get remove -y python3-libxml2 - sudo apt-get install -y libxml2-dev python-dev python-libxml2 - curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py - python get-pip.py - pip --version - python -m pip install --upgrade --no-deps --force-reinstall lxml python -m pip install \ - future \ - pep8 \ pyserial \ tox + - run: rm chirp/drivers/generic_xml.py - run: tox From 4becd24993359f6cda3739320aeb485113f49045 Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 22 Aug 2021 17:31:47 -0700 Subject: [PATCH 2/3] run tests on all platforms --- .github/workflows/test.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c25f4b326..302f9e2f4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,7 +5,11 @@ on: jobs: test: name: Run all tests - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v2 - name: Set up Python From 3e046e1e524dc7efb905cedb20823929cd567993 Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 22 Aug 2021 17:44:59 -0700 Subject: [PATCH 3/3] use python 3 on py3 branch --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 302f9e2f4..9787223fc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '2.7' + python-version: ${{ github.event.pull_request.base.ref == 'py3' && '3.x' || '2.7' }} - name: Install dependencies run: | python -m pip install \