Revert workflows back to using requirements.txt

adafruit · Jun 28, 2022 · 5351396 · 5351396
1 parent 53ac034
commit 5351396
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,14 +39,9 @@ jobs:
         repository: adafruit/actions-ci-circuitpython-libs
         path: actions-ci
     - name: Install repo, dependencies
-      # This is basically a modified version of actions-ci-circuitpython-libs
-      # so basically that will be what changes instead of it being here
+      # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
       run: |
-        sudo apt-get update
-        sudo apt-get install libudev-dev libusb-1.0
-        sudo apt-get install -y gettext
-        pip install circuitpython-build-tools
-        pip install .
+        source actions-ci/install.sh
     - name: Pip install Sphinx, pre-commit
       run: |
         pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,14 +41,9 @@ jobs:
         repository: adafruit/actions-ci-circuitpython-libs
         path: actions-ci
     - name: Install repo, dependencies
-      # This is basically a modified version of actions-ci-circuitpython-libs
-      # so basically that will be what changes instead of it being here
+      # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
       run: |
-        sudo apt-get update
-        sudo apt-get install libudev-dev libusb-1.0
-        sudo apt-get install -y gettext
-        pip install circuitpython-build-tools
-        pip install .
+        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