From 2b0a3d76e268350f2175a6969dd83882a20e94a7 Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Thu, 12 Aug 2021 07:46:03 -0500
Subject: [PATCH 1/7] enable actions

---
 {not.github => .github}/workflows/build.yml   |  0
 {not.github => .github}/workflows/release.yml | 10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename {not.github => .github}/workflows/build.yml (100%)
 rename {not.github => .github}/workflows/release.yml (86%)

diff --git a/not.github/workflows/build.yml b/.github/workflows/build.yml
similarity index 100%
rename from not.github/workflows/build.yml
rename to .github/workflows/build.yml
diff --git a/not.github/workflows/release.yml b/.github/workflows/release.yml
similarity index 86%
rename from not.github/workflows/release.yml
rename to .github/workflows/release.yml
index e6c1ce0..44ca794 100644
--- a/not.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,8 +55,8 @@ jobs:
       with:
         pattern: "bundles/*"
         github-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Upload Assets To AWS S3
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bundles/ s3://adafruit-circuit-python/bundles/community --recursive --no-progress --region us-east-1"
+#    - name: Upload Assets To AWS S3
+#      env:
+#        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+#        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+#      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bundles/ s3://adafruit-circuit-python/bundles/community --recursive --no-progress --region us-east-1"

From 6ef91d65c20c5b4da5cecfdadf5dce6233eade0f Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Thu, 12 Aug 2021 08:27:11 -0500
Subject: [PATCH 2/7] remove quotes from circuitpython-build-bundles command

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 748ec9e..e051e36 100755
--- a/build.sh
+++ b/build.sh
@@ -38,4 +38,4 @@ else
   P="--package_folder_prefix $P"
 fi
 
-circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 "$P"
+circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 $P

From 102e07c77b079ea277274f7d4c6b7eccf74326d2 Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Thu, 12 Aug 2021 08:37:46 -0500
Subject: [PATCH 3/7] use build.sh in release actions

---
 .github/workflows/release.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 44ca794..a6cd737 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,16 +34,8 @@ jobs:
       run: |
         sudo apt-get install -y gettext gawk
         pip install -r requirements.txt
-    - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
-      id: pkg-folder
-      run: |
-        echo ::set-output name=prefix::$(
-        ls -RUx |
-        gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
-        gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
-        )
     - name: Build assets
-      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 }}
+      run: ./build.sh
     - name: Upload Release Assets
       # the 'official' actions version does not yet support dynamically
       # supplying asset names to upload. @csexton's version chosen based on

From 0fb32a0c9101372077ff0c26aa806714dee6cc3a Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Tue, 17 Aug 2021 07:01:31 -0500
Subject: [PATCH 4/7] adding dial widget

---
 .gitmodules                      | 3 +++
 libraries/helpers/displayio_dial | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 libraries/helpers/displayio_dial

diff --git a/.gitmodules b/.gitmodules
index 3fe37e7..ac75b0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "libraries/helpers/displayio_annotation"]
 	path = libraries/helpers/displayio_annotation
 	url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Annotation.git
+[submodule "libraries/helpers/displayio_dial"]
+	path = libraries/helpers/displayio_dial
+	url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Dial.git
diff --git a/libraries/helpers/displayio_dial b/libraries/helpers/displayio_dial
new file mode 160000
index 0000000..a56e59f
--- /dev/null
+++ b/libraries/helpers/displayio_dial
@@ -0,0 +1 @@
+Subproject commit a56e59f5eb483a70998ee13170d33a89c160a1ea

From d8fdbb88bac008b836f4d42d9601a93c21f019e9 Mon Sep 17 00:00:00 2001
From: Alec Delaney <tekktrik@gmail.com>
Date: Mon, 21 Feb 2022 12:08:26 -0500
Subject: [PATCH 5/7] Add displayio_effects library to bundle

---
 .gitmodules                         | 3 +++
 libraries/helpers/displayio_effects | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 libraries/helpers/displayio_effects

diff --git a/.gitmodules b/.gitmodules
index ac75b0f..fe16155 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "libraries/helpers/displayio_dial"]
 	path = libraries/helpers/displayio_dial
 	url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Dial.git
+[submodule "libraries/helpers/displayio_effects"]
+	path = libraries/helpers/displayio_effects
+	url = https://github.com/circuitpython/CircuitPython_Org_DisplayIO_Effects.git
diff --git a/libraries/helpers/displayio_effects b/libraries/helpers/displayio_effects
new file mode 160000
index 0000000..199f434
--- /dev/null
+++ b/libraries/helpers/displayio_effects
@@ -0,0 +1 @@
+Subproject commit 199f434db2cc799b3c1afe6711b21701af88af80

From d120f56424d8fb3bf572ea08e8b3b4e227c56165 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 30 Oct 2023 16:16:57 -0400
Subject: [PATCH 6/7] update workflows

---
 .github/workflows/build.yml   | 14 +++++-----
 .github/workflows/release.yml | 51 ++++++++++++++++++-----------------
 build.sh                      | 10 ++-----
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ccd80da..82182dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,20 +6,18 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Set up Python 3.6
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.6
+        python-version: 3.11
     - name: Versions
       run: |
         python3 --version
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
       with:
         submodules: true
+    - name: Fetch correct submodule shas
+      run: git submodule foreach 'git fetch --tags --depth 1 origin $sha1 && git checkout -q $sha1'
     - name: Install deps
       run: |
         sudo apt-get install -y gettext gawk
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a6cd737..ff14877 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,47 +8,48 @@ jobs:
   upload-release-assets:
     runs-on: ubuntu-latest
     steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
     - name: Translate Repo Name For Build Tools filename_prefix
       id: repo-name
       run: |
-        echo ::set-output name=repo-name::$(
+        echo "repo-name=$(
         echo ${{ github.repository }} |
         awk -F '\/' '{ print tolower($2) }' |
         tr '_' '-'
-        )
-    - name: Set up Python 3.6
-      uses: actions/setup-python@v1
+        )" >> $GITHUB_OUTPUT
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.6
+        python-version: 3.11
     - name: Versions
       run: |
         python3 --version
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
       with:
         submodules: true
+    - name: Fetch correct submodule shas
+      run: git submodule foreach 'git fetch --tags --depth 1 origin $sha1 && git checkout -q $sha1'
     - name: Install deps
       run: |
         sudo apt-get install -y gettext gawk
         pip install -r requirements.txt
+    - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
+      id: pkg-folder
+      run: |
+        echo prefix=$(
+        ls -RUx |
+        gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
+        gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
+        ) >> $GITHUB_OUTPUT
     - name: Build assets
-      run: ./build.sh
+      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 }}
     - name: Upload Release Assets
-      # the 'official' actions version does not yet support dynamically
-      # supplying asset names to upload. @csexton's version chosen based on
-      # discussion in the issue below, as its the simplest to implement and
-      # allows for selecting files with a pattern.
-      # https://github.com/actions/upload-release-asset/issues/4
-      #uses: actions/upload-release-asset@v1.0.1
-      uses: csexton/release-asset-action@master
+      uses: shogo82148/actions-upload-release-asset@v1
       with:
-        pattern: "bundles/*"
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-#    - name: Upload Assets To AWS S3
-#      env:
-#        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-#        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-#      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bundles/ s3://adafruit-circuit-python/bundles/community --recursive --no-progress --region us-east-1"
+        asset_path: "bundles/*"
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        upload_url: ${{ github.event.release.upload_url }}
+    - name: Upload Assets To AWS S3
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bundles/ s3://adafruit-circuit-python/bundles/community --recursive --no-progress --region us-east-1"
diff --git a/build.sh b/build.sh
index e051e36..c8ec2e6 100755
--- a/build.sh
+++ b/build.sh
@@ -28,14 +28,8 @@ set -e
 
 P=$(
 ls -RUx |
-gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
+gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+):/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
 gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
 )
 
-if [ -z "$P" ]; then
-  P=""
-else
-  P="--package_folder_prefix $P"
-fi
-
-circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 $P
+circuitpython-build-bundles --filename_prefix circuitpython-org-bundle --library_location libraries --library_depth 2 --package_folder_prefix "$P"

From 7c696875b80523e19f9f425d6566c00ee0368960 Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Tue, 31 Oct 2023 17:54:34 -0500
Subject: [PATCH 7/7] updating libraries

---
 libraries/helpers/displayio_annotation | 2 +-
 libraries/helpers/displayio_effects    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/helpers/displayio_annotation b/libraries/helpers/displayio_annotation
index 3485d5d..12819ff 160000
--- a/libraries/helpers/displayio_annotation
+++ b/libraries/helpers/displayio_annotation
@@ -1 +1 @@
-Subproject commit 3485d5de3fcc46991ab3739b1ce8f2b30cbcef99
+Subproject commit 12819ffaa729ccb91740976c557a683525a7b559
diff --git a/libraries/helpers/displayio_effects b/libraries/helpers/displayio_effects
index 199f434..c8b9d22 160000
--- a/libraries/helpers/displayio_effects
+++ b/libraries/helpers/displayio_effects
@@ -1 +1 @@
-Subproject commit 199f434db2cc799b3c1afe6711b21701af88af80
+Subproject commit c8b9d221947547352884e94562b764efcbd32308