Merge branch 'release/v0.11.0'

Author: thejpster

.github/workflows/kicad-release.yml

@@ -12,15 +12,23 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set version number # Replace [Uncontrolled] with actual tag
+        with:
+          submodules: recursive
+      - name: Get Branch Name
+        id: branch_name
+        run: |
+          echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
+          echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
+          echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
+      - name: Set version number
         env:
-          GITHUB_REF: ${{ github.ref }}
+          SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
         run: |
-          sed -i "s~\[Uncontrolled\]~${GITHUB_REF/#refs\/tags\/}~g" Kicad/*.sch Kicad/*.kicad_pcb
-      - name: Build project # This would actually build your project, using zip for an example artifact
-        uses: nerdyscout/kicad-exports@v2.2
+          sed -i "s~\[Uncontrolled\]~${SOURCE_TAG}~g" Kicad/*.sch Kicad/*.kicad_pcb
+      - name: Build project
+        uses: nerdyscout/kicad-exports@v2.3
         with:
-          config: 'Kicad/docs.yml'
+          config: 'Kicad/docs.kibot.yaml'
           dir: docs
           schema: 'Kicad/Neotron-Common-Hardware.sch'
           board: 'Kicad/Neotron-Common-Hardware.kicad_pcb'
@@ -31,19 +39,19 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          release_name: Release ${{ steps.branch_name.outputs.SOURCE_TAG }}
           draft: false
           prerelease: false
-      - name: Build zip file
+      - name: Build gerbers zip file
+        env:
+          SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
         run: |
-          zip -r --junk-paths neotron-common-hardware-release.zip docs/
-      - name: Upload Release
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
+          zip -r --junk-paths neotron-common-hardware-gerbers-${SOURCE_TAG}.zip docs/gerbers/
+      - name: Upload files to Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            neotron-common-hardware-gerbers-*.zip
+            docs/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing its ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: ./neotron-common-hardware-release.zip
-          asset_name: neotron-common-hardware-release.zip
-          asset_content_type: application/zip

.github/workflows/kicad.yml

@@ -18,14 +18,23 @@ jobs:
   Kicad:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: nerdyscout/kicad-exports@v2.2
+    - name: Checkout
+      uses: actions/checkout@v2
       with:
-        config: 'Kicad/docs.yml'
+        submodules: recursive
+    - name: Set version number
+      env:
+        GITHUB_SHA: ${{ github.sha }}
+      run: |
+         sed -i "s~\[Uncontrolled\]~${GITHUB_SHA:0:6}~g" Kicad/*.sch Kicad/*.kicad_pcb
+    - name: Run KiBot
+      uses: nerdyscout/[email protected]
+      with:
+        config: 'Kicad/docs.kibot.yaml'
         dir: docs
         schema: 'Kicad/Neotron-Common-Hardware.sch'
         board: 'Kicad/Neotron-Common-Hardware.kicad_pcb'
-    - name: upload results
+    - name: Upload Results
       uses: actions/upload-artifact@v2
       with:
         name: docs

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 * None
 
+## v0.11.0
+
+* Added Expansion Edge connector for making expansion cards.
+
 ## v0.10.0
 
 * SYS_RESET is pulled down.