amazing progress x2

.github/workflows/create-board.yaml

@@ -13,36 +13,21 @@ jobs:
 
       - name: 1. Build Docker
         run: |
-          bash step1_build_hellen-one_docker.sh
+          bash hellen-one/bin/step1_build_hellen-one_docker.sh
 
       - name: 2. Copy
         run: |
-          bash step2_copy_with_docker.sh
+          bash hellen-one/bin/step2_copy_with_docker.sh
 
       - name: 3. Create Board
         run: |
-          bash step3_create_board_with_docker.sh
+          bash hellen-one/bin/step3_create_board_with_docker.sh
 
       - name: Commit fresh board files
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub create-board Action"
-          git add boards/*
-          git status
-          OUT=$(git commit -am "Auto-generated board" 2>&1) || echo "commit failed, finding out why"
-          if echo "$OUT" | grep 'nothing to commit'; then
-            echo "headers: looks like nothing to commit"
-            echo "::set-env name=NOCOMMIT::true"
-            exit 0
-          elif echo "$OUT" | grep 'changed'; then
-            echo "headers: looks like something has changed"
-            exit 0
-          else
-            echo "headers: looks like something unexpected"
-            exit 1
-          fi
+          bash hellen-one/bin/gha-commit.sh
 
       - name: Push board files
         if: ${{env.NOCOMMIT != 'true'}}

hellen-one

@@ -1 +1 @@
-Subproject commit 7ef7b566ddc6f19a3a39695ce322ff604ca7e039
+Subproject commit ccce677b95ae221da30ae894b5222f4e286799dc

revision.txt

@@ -1,8 +1,8 @@
 # make sure to increment revision BEFORE any changes to content
 
-BOARD_REVISION=d
 BOARD_PREFIX=alphax_
 BOARD_SUFFIX=2ch
+BOARD_REVISION=d
 
 # does not affect fab files, only needed to have nice rendered preview
 BOARD_PCB_OFFSET=0,4

step1_build_hellen-one_docker.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ ! -f hellen-one/git_scripts ]; then
-    echo "No submodules?"
-    git submodule update --init --recursive
-fi
-
-cd hellen-one
-
-docker build -t hellen-one .

step2_copy_with_docker.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [ ! -f hellen-one/git_scripts ]; then
-    echo "No submodules?"
-    git submodule update --init --recursive
-fi
-
-
-# This command is me trying to be fancy
-# '--entrypoint python3' skips the normal container CMD and starts python3 instead
-#    using the parameters specified after 'hellen-one'
-#
-# -v "$(pwd)":/${PWD##*/} simply mounts the current working directory
-#    at /<the name of the current directory>
-#
-# '/${PWD##*/}' is doing the $pwd basename thing again
-
-source revision.txt
-echo "BOARD_REVISION=[${BOARD_REVISION}]"
-
-docker run --rm -t --user $(id -u):$(id -g) --entrypoint python3 -v "$(pwd)":/${PWD##*/} hellen-one ./bin/copy_from_Kicad.py "frames:${BOARD_PREFIX}" "/${PWD##*/}" "../../gerber" "${BOARD_SUFFIX}" "${BOARD_REVISION}"
-
-echo "Done!"

step3_create_board_with_docker.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ ! -f hellen-one/git_scripts ]; then
-    echo "No submodules?"
-    git submodule update --init --recursive
-fi
-
-# See step2_copy_with_docker.sh for explanation of the following command
-
-source revision.txt
-echo "BOARD_REVISION=[${BOARD_REVISION}]"
-
-docker run --rm -t --user $(id -u):$(id -g) --entrypoint bash -v "$(pwd)":/${PWD##*/} hellen-one ./bin/create_board_with_prefix.sh "${BOARD_PREFIX}" "/${PWD##*/}" "${BOARD_SUFFIX}" "${BOARD_REVISION}" "bom_replace_${BOARD_PREFIX}${BOARD_SUFFIX}-${BOARD_REVISION}.csv " "${BOARD_PCB_OFFSET}"
-