use build-tools pkg-prefix option correctly

2bndy5 · Oct 10, 2022 · 9b62f43 · 9b62f43
1 parent 55cdc39
commit 9b62f43
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -93,6 +93,14 @@ jobs:
           tr '_' '-'
           )
 
+      - name: Translate Repo Name For Build Tools package_prefix
+        id: pkg-name
+        run: |
+          echo ::set-output name=pkg-name::$(
+          echo ${{ github.repository }} |
+          awk -F '\/' '{ print tolower($2) }'
+          )
+
       - uses: actions/checkout@v3
 
       - name: Set up Python 3.x
@@ -104,7 +112,7 @@ jobs:
         run: pip install circuitpython-build-tools
 
       - name: Build assets
-        run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --package_folder_prefix "" --library_location .
+        run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --package_folder_prefix ${{ steps.pkg-name.outputs.pkg-name }} --library_location .
 
       - name: Archive bundles
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,6 +23,14 @@ jobs:
           tr '_' '-'
           )
 
+      - name: Translate Repo Name For Build Tools package_prefix
+        id: pkg-name
+        run: |
+          echo ::set-output name=pkg-name::$(
+          echo ${{ github.repository }} |
+          awk -F '\/' '{ print tolower($2) }'
+          )
+
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
@@ -45,7 +53,7 @@ jobs:
           source actions-ci/install.sh
 
       - name: Build assets
-        run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --package_folder_prefix "" --library_location .
+        run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --package_folder_prefix ${{ steps.pkg-name.outputs.pkg-name }} --library_location .
 
       - name: Upload Release Assets
         # the 'official' actions version does not yet support dynamically