From 322fcd6cd8d9a171de81a80af00f3baaaf21d178 Mon Sep 17 00:00:00 2001 From: dherrada Date: Tue, 3 Dec 2019 18:52:51 -0500 Subject: [PATCH 1/2] Moving from Travis to Github Actions --- .github/workflows/build.yml | 47 +++++++++++++++++++++++ .github/workflows/release.yml | 70 +++++++++++++++++++++++++++++++++++ .gitignore | 1 - .travis.yml | 33 ----------------- README.rst | 4 +- 5 files changed, 119 insertions(+), 36 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..54c6663 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,47 @@ +name: Build CI + +on: [pull_request, push] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - name: Translate Repo Name For Build Tools filename_prefix + id: repo-name + run: | + echo ::set-output name=repo-name::$( + echo ${{ github.repository }} | + awk -F '\/' '{ print tolower($2) }' | + tr '_' '-' + ) + - name: Set up Python 3.6 + uses: actions/setup-python@v1 + with: + python-version: 3.6 + - name: Versions + run: | + python3 --version + - uses: actions/checkout@v1 + with: + submodules: true + - name: Install deps + run: | + sudo apt-get install -y gettext + pip install -r requirements.txt + pip install circuitpython-build-tools Sphinx sphinx-rtd-theme + pip install --force-reinstall pylint==1.9.2 + - name: Library version + run: git describe --dirty --always --tags + - name: PyLint + run: | + pylint $( find . -path './adafruit*.py' ) + ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py) + - name: Build assets + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + - name: Build docs + working-directory: docs + run: sphinx-build -E -W -b html . _build/html diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..83fc810 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,70 @@ +name: Release Actions + +on: + release: + types: [published] + +jobs: + upload-release-assets: + runs-on: ubuntu-latest + steps: + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - name: Translate Repo Name For Build Tools filename_prefix + id: repo-name + run: | + echo ::set-output name=repo-name::$( + echo ${{ github.repository }} | + awk -F '\/' '{ print tolower($2) }' | + tr '_' '-' + ) + - name: Set up Python 3.6 + uses: actions/setup-python@v1 + with: + python-version: 3.6 + - name: Versions + run: | + python3 --version + - uses: actions/checkout@v1 + with: + submodules: true + - name: Install deps + run: | + sudo apt-get install -y gettext + pip install -r requirements.txt + pip install circuitpython-build-tools Sphinx sphinx-rtd-theme + - name: Build assets + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + - name: Upload Release Assets + # the 'official' actions version does not yet support dynamically + # supplying asset names to upload. @csexton's version chosen based on + # discussion in the issue below, as its the simplest to implement and + # allows for selecting files with a pattern. + # https://github.com/actions/upload-release-asset/issues/4 + #uses: actions/upload-release-asset@v1.0.1 + uses: csexton/release-asset-action@master + with: + pattern: "bundles/*" + github-token: ${{ secrets.GITHUB_TOKEN }} + + upload-pypi: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install setuptools wheel twine + - name: Build and publish + env: + TWINE_USERNAME: ${{ secrets.pypi_username }} + TWINE_PASSWORD: ${{ secrets.pypi_password }} + run: | + python setup.py sdist + twine upload dist/* diff --git a/.gitignore b/.gitignore index 55f127b..c83f8b7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ __pycache__ _build *.pyc .env -build* bundles *.DS_Store .eggs diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 254f5a4..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -dist: trusty -sudo: false -language: python -python: -- '3.6' -cache: - pip: true -deploy: -- provider: releases - api_key: "$GITHUB_TOKEN" - file_glob: true - file: "$TRAVIS_BUILD_DIR/bundles/*" - skip_cleanup: true - overwrite: true - on: - tags: true -- provider: pypi - user: adafruit-travis - on: - tags: true - password: - secure: d32Fn+dn/5MKBmH6VWJUrptBuV8Yvg//if4rBg+sUuXoMMeYI9wyeLhNkJMnDu2HcU4UZUG5YDX4H+pz3CMb1Y2acH/m42UxTB8hMP09iOTeHOq3F+lc26byDajZK5BeHfaLegFjvzhvJjsd1pUgBgRq7FVYiPJ9d6K63eCnBKzxM/3IhlsnsM3mI1AbGGEtRQWRTxeM1T/gRtsJ6l/pj6sG8gXuubEXzTV9EjX5PuPDfd1EViEvoe7EueCUYZEeZ7ds+IjoRJxhwXOGUq/k8Mtd7tyYzvffjx8lZEJDIzjHg+aEVQ1Fx+ULXGgqZ2sQRwg9izLdYuv+5o24coWRKde5iSbdRLX+iam982gUG9O7WrUG071GMgG6QAasXWOz7BXxWb0JIb81ijQ2M1QdQdqCByvQ4K60h3y3g8GiVYbdgb5QUknCEKUCDnqDi0DqRScmg5q1BZ7LVX23CqAnykmxnHAn/9B+C2Me0jBXUgbjfs4iw9MtnD5eiGUCdSnZIYOW5y/cjer2Z1dmz3yGICnuUw59zh9V4WbrW21zNpLnPY5aVfBKYfJXcoceI7HM/1aScB4ka+8D2/votoT0f+txhqIGn64QZF8pW+u/JjWUWQM9NPAFRbfER3YjrXJodTAdNt9P3zYxkAgE8Btk92LVVyBe+DK74wcIxnYmX8k= -install: -- pip install -r requirements.txt -- pip install circuitpython-build-tools Sphinx sphinx-rtd-theme -- pip install --force-reinstall pylint==1.9.2 -script: -- pylint adafruit_tfmini.py -- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace - examples/*.py) -- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-tfmini --library_location - . -- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/README.rst b/README.rst index 78faa8b..26fd962 100644 --- a/README.rst +++ b/README.rst @@ -9,8 +9,8 @@ Introduction :target: https://discord.gg/nBQh6qu :alt: Discord -.. image:: https://travis-ci.com/adafruit/Adafruit_CircuitPython_TFmini.svg?branch=master - :target: https://travis-ci.com/adafruit/Adafruit_CircuitPython_TFmini +.. image:: https://github.com/adafruit/Adafruit_CircuitPython_TFmini/workflows/Build%CI/badge.svg + :target: https://github.com/adafruit/Adafruit_CircuitPython_TFmini :alt: Build Status A CircuitPython/Python library for Benewake's TF mini distance sensor From 14233862247f011e6859c97a7ddec87fa85f0eac Mon Sep 17 00:00:00 2001 From: dherrada Date: Wed, 1 Jan 2020 15:38:19 -0500 Subject: [PATCH 2/2] Updated build.yml and release.yml --- .github/workflows/build.yml | 13 ++++++++----- .github/workflows/release.yml | 19 +++++++++++++++---- README.rst | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54c6663..66ce4db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,15 +25,18 @@ jobs: - name: Versions run: | python3 --version - - uses: actions/checkout@v1 + - name: Checkout Current Repo + uses: actions/checkout@v1 with: submodules: true + - name: Checkout tools repo + uses: actions/checkout@v2 + with: + repository: adafruit/actions-ci-circuitpython-libs + path: actions-ci - name: Install deps run: | - sudo apt-get install -y gettext - pip install -r requirements.txt - pip install circuitpython-build-tools Sphinx sphinx-rtd-theme - pip install --force-reinstall pylint==1.9.2 + source actions-ci/install.sh - name: Library version run: git describe --dirty --always --tags - name: PyLint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83fc810..18efb9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,14 +27,18 @@ jobs: - name: Versions run: | python3 --version - - uses: actions/checkout@v1 + - name: Checkout Current Repo + uses: actions/checkout@v1 with: submodules: true + - name: Checkout tools repo + uses: actions/checkout@v2 + with: + repository: adafruit/actions-ci-circuitpython-libs + path: actions-ci - name: Install deps run: | - sudo apt-get install -y gettext - pip install -r requirements.txt - pip install circuitpython-build-tools Sphinx sphinx-rtd-theme + source actions-ci/install.sh - name: Build assets run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . - name: Upload Release Assets @@ -53,15 +57,22 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - name: Check For setup.py + id: need-pypi + run: | + echo ::set-output name=setup-py::$( find . -wholename './setup.py' ) - name: Set up Python + if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') uses: actions/setup-python@v1 with: python-version: '3.x' - name: Install dependencies + if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') run: | python -m pip install --upgrade pip pip install setuptools wheel twine - name: Build and publish + if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') env: TWINE_USERNAME: ${{ secrets.pypi_username }} TWINE_PASSWORD: ${{ secrets.pypi_password }} diff --git a/README.rst b/README.rst index 26fd962..4c028a3 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ Introduction :alt: Discord .. image:: https://github.com/adafruit/Adafruit_CircuitPython_TFmini/workflows/Build%CI/badge.svg - :target: https://github.com/adafruit/Adafruit_CircuitPython_TFmini + :target: https://github.com/adafruit/Adafruit_CircuitPython_TFmini/actions/ :alt: Build Status A CircuitPython/Python library for Benewake's TF mini distance sensor