Merge branch 'adafruit:main' into main

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fe5064b350be4a29d17ff01796f6c310d7fddb0..ea5eab574717f0571002f74b20631e2d7eb86ea3 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,20 +15,20 @@ jobs:
       run: echo "$GITHUB_CONTEXT"
     - name: Translate Repo Name For Build Tools filename_prefix
       id: repo-name
-      run: echo ::set-output name=repo-name::Adafruit-Blinka
+      run: echo "repo-name=Adafruit-Blinka" >> $GITHUB_OUTPUT
     - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.7
     - name: Versions
       run: |
         python3 --version
     - name: Checkout Current Repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
     - name: Checkout tools repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: adafruit/actions-ci-circuitpython-libs
         path: actions-ci

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8399b734d73a7fbc4a6001ab52bd666d7c1f2ba..a0eb8f585040b9b917433fced8551f7ff75c3f37 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,14 +11,14 @@ jobs:
   upload-pypi:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Check For setup.py
       id: need-pypi
       run: |
-        echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
+        echo "setup-py=$( find . -wholename './setup.py' )" >> $GITHUB_OUTPUT
     - name: Set up Python
       if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - name: Install dependencies

diff --git a/src/adafruit_blinka/board/generic_linux_pc.py b/src/adafruit_blinka/board/generic_linux_pc.py
new file mode 100644 (file)
index 0000000..bb3e737
--- /dev/null
+++ b/src/adafruit_blinka/board/generic_linux_pc.py
@@ -0,0 +1,4 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""(Empty) definitions for the GENERIC_LINUX_PC."""

diff --git a/src/board.py b/src/board.py
index bd93eb515b4bf6790a01faad0e00032e72aab20d..a1e800c2fc9f3a0800cdfd1fa2665e69990e8085 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -310,9 +310,15 @@ elif board_id == ap_board.LICHEE_RV:
 elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV:
     from adafruit_blinka.board.siemens.siemens_iot2050 import *
 
+elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_BASIC:
+    from adafruit_blinka.board.siemens.siemens_iot2050 import *
+
 elif board_id == ap_board.AML_S905X_CC:
     from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
 
+elif board_id == ap_board.GENERIC_LINUX_PC:
+    from adafruit_blinka.board.generic_linux_pc import *
+
 elif "sphinx" in sys.modules:
     pass