From bf332ac8519e7426ba8bd696593f4ee17299c4d7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 13 Jun 2023 21:10:02 -0500
Subject: [PATCH 1/5] Invoke circuitpython-build-bundles identically for PRs &
 releases

---
 build/action.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/build/action.yml b/build/action.yml
index 063c25f..68333ba 100644
--- a/build/action.yml
+++ b/build/action.yml
@@ -71,9 +71,18 @@ runs:
         pip install .
         pytest
       fi
+  - name: Add the given package filename_prefix
+    id: package-prefix-arg
+    shell: bash
+    run: |
+      if [ "${{ inputs.package-prefix }}" == "" ]; then
+        echo prefix-arg="" >> $GITHUB_OUTPUT
+      else
+        echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT
+      fi
   - name: Build assets
     shell: bash
-    run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
+    run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }}
   - name: Archive bundles
     uses: actions/upload-artifact@v3
     with:

From e9a918e851fe76d96039e45ae6212f9af690b6be Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 14 Jun 2023 07:28:58 -0500
Subject: [PATCH 2/5] actually accept the package-prefix argument

---
 build/action.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/action.yml b/build/action.yml
index 68333ba..7495195 100644
--- a/build/action.yml
+++ b/build/action.yml
@@ -9,6 +9,12 @@ inputs:
     description: 'The version of Python to use in the CI'
     required: true
     default: '3.x'
+  package-prefix:
+    description: |
+      The prefix (or name) of your pacakge (if applicable) to use
+      for GitHub releases
+    required: true
+    default: ""
 runs:
   using: "composite"
   steps:

From 847c4802a863d1cafabcc01609bea9b40e0c56f3 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 21 Jan 2024 10:59:43 -0600
Subject: [PATCH 3/5] show any diff introduced by pre-commit during CI

---
 .github/workflows/build.yml | 2 +-
 build/action.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ebfb49..d8e6fc3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,4 +25,4 @@ jobs:
     - name: Install pre-commit
       run: pip install pre-commit
     - name: Run pre-commit
-      run: pre-commit run --all-files
+      run: pre-commit run --all-files --show-diff-on-failure
diff --git a/build/action.yml b/build/action.yml
index 7495195..85997ce 100644
--- a/build/action.yml
+++ b/build/action.yml
@@ -61,7 +61,7 @@ runs:
   - name: Pre-commit hooks
     shell: bash
     run: |
-      pre-commit run --all-files
+      pre-commit run --all-files --show-diff-on-failure
   - name: Install pytest
     shell: bash
     run: pip install pytest

From 519b1441d5114c0f0504c6eaf6102fd6d149f793 Mon Sep 17 00:00:00 2001
From: Alec Delaney <tekktrik@gmail.com>
Date: Tue, 30 Jan 2024 15:34:56 -0500
Subject: [PATCH 4/5] Remove duplicate code

---
 build/action.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/build/action.yml b/build/action.yml
index 992cbe1..6594c23 100644
--- a/build/action.yml
+++ b/build/action.yml
@@ -82,15 +82,6 @@ runs:
       else
         echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT
       fi
-  - name: Add the given package filename_prefix
-    id: package-prefix-arg
-    shell: bash
-    run: |
-      if [ "${{ inputs.package-prefix }}" == "" ]; then
-        echo prefix-arg="" >> $GITHUB_OUTPUT
-      else
-        echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT
-      fi
   - name: Build assets
     shell: bash
     run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }}

From 3b2cf64faefd864989de23e9ecf6acf33fdefd86 Mon Sep 17 00:00:00 2001
From: Alec Delaney <tekktrik@gmail.com>
Date: Tue, 30 Jan 2024 15:35:54 -0500
Subject: [PATCH 5/5] Fix typos

---
 build/action.yml      | 2 +-
 release-gh/action.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/action.yml b/build/action.yml
index 6594c23..5a8f986 100644
--- a/build/action.yml
+++ b/build/action.yml
@@ -11,7 +11,7 @@ inputs:
     default: '3.11'
   package-prefix:
     description: |
-      The prefix (or name) of your pacakge (if applicable) to use
+      The prefix (or name) of your package (if applicable) to use
       for GitHub releases
     required: true
     default: ""
diff --git a/release-gh/action.yml b/release-gh/action.yml
index d2d5afd..5a68ea4 100644
--- a/release-gh/action.yml
+++ b/release-gh/action.yml
@@ -17,7 +17,7 @@ inputs:
     default: '3.11'
   package-prefix:
     description: |
-      The prefix (or name) of your pacakge (if applicable) to use
+      The prefix (or name) of your package (if applicable) to use
       for GitHub releases
     required: true
     default: ""