Merge pull request #1 from adafruit/main

Merged main to fork

2 files changed, 21 insertions, 3 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8ddb8bbd4..406f6c43b 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 black
     - 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"
@@ -188,6 +195,7 @@ jobs:
         - "hallowing_m0_express"
         - "hallowing_m4_express"
         - "hiibot_bluefi"
+        - "ikigaisense_vita"
         - "imxrt1010_evk"
         - "imxrt1020_evk"
         - "imxrt1060_evk"
@@ -196,6 +204,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"
@@ -207,6 +217,7 @@ jobs:
         - "mini_sam_m4"
         - "monster_m4sk"
         - "ndgarage_ndbit6"
+        - "ndgarage_ndbit6_v2"
         - "nfc_copy_cat"
         - "nice_nano"
         - "nucleo_f746zg"
@@ -236,6 +247,7 @@ jobs:
         - "pyportal"
         - "pyportal_titano"
         - "pyruler"
+        - "raytac_mdbt50q-db-40"
         - "robohatmm1_m4"
         - "sam32"
         - "same54_xplained"
@@ -264,6 +276,7 @@ jobs:
         - "teensy41"
         - "teknikio_bluebird"
         - "thunderpack"
+        - "tinkeringtech_scoutmakes_azul"
         - "trellis_m4_express"
         - "trinket_m0"
         - "trinket_m0_haxpress"
@@ -370,6 +383,7 @@ jobs:
         board:
         - "espressif_saola_1_wroom"
         - "espressif_saola_1_wrover"
+        - "unexpectedmaker_feathers2"
 
     steps:
     - name: Set up Python 3.8
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: