build on every push

Author: heythisisnate

Diff for: .github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-on: pull_request
+on: push
 
 jobs:
   build-upload:
@@ -20,16 +20,19 @@ jobs:
           sudo apt-get -y install libusb-1.0-0 cmake srecord
           pip install -U pyserial
 
-      - name: Build
+      - id: build
+        name: Build
         env:
-          PR_NUMBER: ${{ github.event.number }}
-        run: ./scripts/build-firmware
+          SHA: ${{ github.event.head }}
+        run: |
+          fname=$(./scripts/build-firmware | tail -1)
+          echo "::set-output fname=fname::$fname"
 
       - uses: keithweaver/[email protected]
-        name: Copy PR bin to AWS
+        name: Copy build to AWS
         with:
           command: cp
-          source: build/konnected-esp8266-PR-${{ github.event.number }}.bin
+          source: build/${{ steps.build.outputs.fname }}
           destination: s3://konnected-io/builds/
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

Diff for: scripts/build-firmware

@@ -15,11 +15,7 @@ function usage() {
 set -e
 
 if ! git describe --exact-match --tags &> /dev/null; then
-  if [[ -z "${PR_NUMBER}" ]]; then
-    BRANCH="$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')"
-  else
-    BRANCH="PR-"${PR_NUMBER}
-  fi
+  BRANCH="$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')"
 else
   BRANCH="$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))"
 fi
@@ -108,9 +104,11 @@ echo
 
 # Build full image
 srec_cat -output "${OUTPUT_BASE}/konnected-esp8266-${BRANCH}.bin" -binary "${OUTPUT_BASE}/${IMAGE_NAME}.bin" -binary -fill 0xff 0x0000 0x100000 "${OUTPUT_BASE}/konnected-filesystem-0x100000-${BRANCH}.img" -binary -offset 0x100000
+echo "Wrote ${OUTPUT_BASE}/konnected-esp8266-${BRANCH}.bin"
 
 # Copy to common name for ease of flashing
 cp "${OUTPUT_BASE}/konnected-esp8266-${BRANCH}.bin" "${OUTPUT_BASE}/konnected-esp8266-latest.bin"
 
-echo "Build Complete: Flash this build with './scripts/flash ${BRANCH} <port>'"
+echo "Build Complete:Flash this build with './scripts/flash ${BRANCH} <port>'"
+echo "konnected-esp8266-${BRANCH}.bin"