From ef83fabca77a7a758f90fd14beaa3cd022f68279 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 27 Dec 2022 12:42:42 -0800 Subject: [PATCH] Remove py2 github action stuff --- .github/actions/py2-tox/action.yaml | 29 -------------- .github/workflows/py2-test.yaml | 57 --------------------------- .github/workflows/py3-pr.yaml | 42 -------------------- .github/workflows/test-py3-merge.yaml | 35 ---------------- 4 files changed, 163 deletions(-) delete mode 100644 .github/actions/py2-tox/action.yaml delete mode 100644 .github/workflows/py2-test.yaml delete mode 100644 .github/workflows/py3-pr.yaml delete mode 100644 .github/workflows/test-py3-merge.yaml diff --git a/.github/actions/py2-tox/action.yaml b/.github/actions/py2-tox/action.yaml deleted file mode 100644 index 2ff11b16..00000000 --- a/.github/actions/py2-tox/action.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Python2 tox runner -description: Runs tox py2 targets -inputs: - tox_target: - required: true - type: string - -runs: - using: "composite" - steps: - - name: Install dependencies - shell: bash - run: | - sudo apt-get update - 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 - - name: Run tox - shell: bash - run: | - tox -e ${{ inputs.tox_target }} diff --git a/.github/workflows/py2-test.yaml b/.github/workflows/py2-test.yaml deleted file mode 100644 index f18bb1f0..00000000 --- a/.github/workflows/py2-test.yaml +++ /dev/null @@ -1,57 +0,0 @@ -name: Tests -on: - pull_request: - branches: - - master - push: - branches: - - master -jobs: - style: - name: Style checks - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Run tox - uses: ./.github/actions/py2-tox - with: - tox_target: style - - unit: - name: Unit tests - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Run tox - uses: ./.github/actions/py2-tox - with: - tox_target: unit - - driver: - name: Driver tests - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Run tox - uses: ./.github/actions/py2-tox - with: - tox_target: driver - - matrix: - name: Create support matrix - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Run tox - uses: ./.github/actions/py2-tox - with: - tox_target: makesupported - - name: Archive support matrix - uses: actions/upload-artifact@v3 - with: - name: support-matrix - path: model_support.html diff --git a/.github/workflows/py3-pr.yaml b/.github/workflows/py3-pr.yaml deleted file mode 100644 index bb0a0c26..00000000 --- a/.github/workflows/py3-pr.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: Sync to py3 branch -on: - push: - branches: - - master -jobs: - makepr: - name: Generate PR - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Merge with py3 - run: | - git fetch origin py3 - git checkout origin/py3 -b py3-sync - git config --global user.email "bot@chirp.danplanet.com" - git config --global user.name "Merge Bot" - git merge $GITHUB_SHA --allow-unrelated-histories --no-edit || { - git add -u - git commit --no-edit - } - git checkout -b auto-py3-$GITHUB_SHA - - name: Update support matrix if needed - run: | - sudo apt-get update - sudo apt-get install python3-pip python3-wxgtk4.0 - sudo python3 -mpip install tox - tox -e makesupported || git commit -m "Update support matrix" tests/Python3_Driver_Testing.md || true - - name: Push changes - run: | - git push origin auto-py3-$GITHUB_SHA:auto-py3-$GITHUB_SHA - - name: Create PR - uses: repo-sync/pull-request@v2 - with: - github_token: ${{ secrets.PR_SYNC }} - source_branch: auto-py3-${{ github.sha }} - destination_branch: py3 - pr_title: "[Automated] Sync master with py3" - pr_body: "Automated pull request to sync py3 with changes from master" diff --git a/.github/workflows/test-py3-merge.yaml b/.github/workflows/test-py3-merge.yaml deleted file mode 100644 index bdd7c9bb..00000000 --- a/.github/workflows/test-py3-merge.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Test merging against py3 -on: - pull_request: - branches: - - master - push: - branches: - - master -jobs: - test: - name: Merge and run all tests - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Merge with py3 - run: | - echo SHA $GITHUB_SHA - echo REF $GITHUB_REF - git fetch origin py3 - git branch -a - git checkout origin/py3 -b py3-test - echo HEAD $(git rev-parse HEAD) - git config --global user.email "bot@chirp.danplanet.com" - git config --global user.name "Merge Bot" - git merge $GITHUB_SHA --allow-unrelated-histories --no-edit - - name: install dependencies - run: | - sudo apt-get update - sudo apt-get install python3-pip gobject-introspection python3-gi libgirepository1.0-dev - sudo python3 -mpip install tox - - name: Run tests - run: tox -e py3unit,py3driver,style