diff options
| author | hierophect <hierophect@gmail.com> | 2020-07-22 13:59:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 13:59:39 -0400 |
| commit | e232ec10ceb9c78df27cb4b5cee79079efd85d84 (patch) | |
| tree | 132c5bfbc1db02d29a82021be595eec1a1122ae8 /.github | |
| parent | 138189bad130569ac9a9b3051543b804db54ec6f (diff) | |
| parent | 05a10f7905bfb77f3d5dff2525c9d10375801329 (diff) | |
Merge branch 'main' into stm32-timer-allocator
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/create_website_pr.yml | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68dbb04c7..d809ba8cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors) +# +# SPDX-License-Identifier: MIT + name: Build CI on: @@ -22,7 +26,9 @@ jobs: fetch-depth: 0 - run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/* - name: CircuitPython version - run: git describe --dirty --tags + run: | + git describe --dirty --tags + echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)" - name: Set up Python 3.8 uses: actions/setup-python@v1 with: @@ -31,7 +37,7 @@ jobs: run: | sudo apt-get install -y eatmydata sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 - pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid + pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort - name: Versions run: | gcc --version @@ -68,7 +74,7 @@ jobs: name: stubs path: circuitpython-stubs* - name: Docs - run: sphinx-build -E -W -b html . _build/html + run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html - uses: actions/upload-artifact@v2 with: name: docs @@ -147,6 +153,7 @@ jobs: - "arduino_zero" - "bast_pro_mini_m0" - "bdmicro_vina_m0" + - "bless_dev_board_multi_sensor" - "capablerobot_usbhub" - "catwan_usbstick" - "circuitbrains_basic_m0" @@ -196,6 +203,8 @@ jobs: - "itsybitsy_nrf52840_express" - "kicksat-sprite" - "loc_ber_m4_base_board" + - "makerdiary_m60_keyboard" + - "makerdiary_nrf52840_m2_devkit" - "makerdiary_nrf52840_mdk" - "makerdiary_nrf52840_mdk_usb_dongle" - "meowbit_v121" @@ -265,6 +274,7 @@ jobs: - "teensy41" - "teknikio_bluebird" - "thunderpack" + - "tinkeringtech_scoutmakes_azul" - "trellis_m4_express" - "trinket_m0" - "trinket_m0_haxpress" diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml index 9907c08ae..71959ffdc 100644 --- a/.github/workflows/create_website_pr.yml +++ b/.github/workflows/create_website_pr.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors) +# +# SPDX-License-Identifier: MIT + name: Update CircuitPython.org on: |