Skip to content

Commit 733f583

Browse files
Merge branch 'adafruit:main' into main
2 parents 7550b86 + 03f7a64 commit 733f583

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
GITHUB_CONTEXT: ${{ toJson(github) }}
1212
run: echo "$GITHUB_CONTEXT"
1313
- name: Set up Python 3
14-
uses: actions/setup-python@v1
14+
uses: actions/setup-python@v4
1515
with:
1616
python-version: 3.x
1717
- name: Versions
1818
run: |
1919
python3 --version
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
with:
2222
submodules: true
2323
- name: Fetch correct submodule shas

.github/workflows/release.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ jobs:
1515
- name: Translate Repo Name For Build Tools filename_prefix
1616
id: repo-name
1717
run: |
18-
echo ::set-output name=repo-name::$(
18+
echo "repo-name=$(
1919
echo ${{ github.repository }} |
2020
awk -F '\/' '{ print tolower($2) }' |
2121
tr '_' '-'
22-
)
22+
)" >> $GITHUB_OUTPUT
2323
- name: Set up Python 3
24-
uses: actions/setup-python@v1
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: 3.x
2727
- name: Versions
2828
run: |
2929
python3 --version
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3131
with:
3232
submodules: true
3333
- name: Fetch correct submodule shas
@@ -39,24 +39,19 @@ jobs:
3939
- name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
4040
id: pkg-folder
4141
run: |
42-
echo ::set-output name=prefix::$(
42+
echo prefix=$(
4343
ls -RUx |
4444
gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
4545
gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
46-
)
46+
) >> $GITHUB_OUTPUT
4747
- name: Build assets
4848
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }}
4949
- name: Upload Release Assets
50-
# the 'official' actions version does not yet support dynamically
51-
# supplying asset names to upload. @csexton's version chosen based on
52-
# discussion in the issue below, as its the simplest to implement and
53-
# allows for selecting files with a pattern.
54-
# https://github.com/actions/upload-release-asset/issues/4
55-
#uses: actions/upload-release-asset@v1.0.1
56-
uses: csexton/release-asset-action@master
50+
uses: shogo82148/actions-upload-release-asset@v1
5751
with:
58-
pattern: "bundles/*"
59-
github-token: ${{ secrets.GITHUB_TOKEN }}
52+
asset_path: "bundles/*"
53+
github_token: ${{ secrets.GITHUB_TOKEN }}
54+
upload_url: ${{ github.event.release.upload_url }}
6055
- name: Upload Assets To AWS S3
6156
env:
6257
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,6 @@
272272
[submodule "libraries/helpers/color_picker"]
273273
path = libraries/helpers/color_picker
274274
url = https://github.com/jposada202020/CircuitPython_color_picker.git
275+
[submodule "libraries/drivers/gpio_expander"]
276+
path = libraries/drivers/gpio_expander
277+
url = https://github.com/gpongelli/CircuitPython_gpio_expander.git

circuitpython_community_library_list.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Here is a listing of current CircuitPython Community Libraries. These libraries
1212
* [CircuitPython AS3935](https://github.com/BiffoBear/CircuitPython_AS3935.git) Library for the Franklin AS3935 lightning detector. The driver supports connections via SPI and I2C. \([Docs](https://circuitpython-as3935.readthedocs.io/))
1313
* [CircuitPython_DRV8830](https://github.com/CedarGroveStudios/CircuitPython_DRV8830.git) A driver for the DRV8830 DC motor controller.
1414
* [CircuitPython GC9A01](https://github.com/tylercrumpton/CircuitPython_GC9A01.git) Displayio driver for GC9A01 TFT LCD displays.
15+
* [CircuitPython gpio_expander](https://github.com/gpongelli/CircuitPython_gpio_expander.git) I2C GPIO expander support for PCA9534, PCA9535, PCA9555, TCA9534, TCA9535 and TCA9555 chips. ([PyPi](https://pypi.org/project/circuitpython-gpio-expander/)) \([Docs](https://github.com/gpongelli/CircuitPython_gpio_expander/blob/main/README.rst))
1516
* [CircuitPython HCSR04](https://github.com/mmabey/CircuitPython_HCSR04.git) Library for The HC-SR04 for measuring distances using microcontrollers \([Docs](https://circuitpython-hcsr04.readthedocs.io/en/latest/))
1617
* [CircuitPython HX711](https://github.com/fivesixzero/CircuitPython_HX711) CircuitPython driver for the HX711 load cell amplifer and ADC \([Docs](https://circuitpython-hx711.readthedocs.io/en/latest/))
1718
* [CircuitPython INA3221](https://github.com/barbudor/CircuitPython_INA3221.git) CircuitPython driver for the Texas Instruments' INA3221 3 channels current sensor. \([Docs](https://circuitpython-ina3221.readthedocs.io/en/latest/))

libraries/drivers/gpio_expander

Submodule gpio_expander added at 582111e

libraries/helpers/color_picker

libraries/helpers/equalizer

libraries/helpers/styles

0 commit comments

Comments
 (0)