More zip tweaks

anttix · Dec 23, 2019 · 90ccbf7 · 90ccbf7
1 parent 31903d4
commit 90ccbf7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/v1-builds.yml b/.github/workflows/v1-builds.yml
@@ -84,11 +84,12 @@ jobs:
         chmod +x buildroot/bin/*
         chmod +x buildroot/share/tests/*
         v1-scripts/build-for-machine ${{ matrix.machine.cfg }} -e ${{ matrix.machine.env }}
-        v1-scripts/build-zips ${{ matrix.machine.cfg }} ${{ matrix.machine.env }} ${{ matrix.machine.out }}
+        v1-scripts/build-src-zip ${{ matrix.machine.cfg }}
+        v1-scripts/copy-binaries ${{ matrix.machine.cfg }} ${{ matrix.machine.env }} ${{ matrix.machine.out }}
     - name: Release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: ".zips/*.zip,.zips/*.${{ matrix.machine.out }}"
+        artifacts: ".zip/*.zip,.bin/*"
         #bodyFile: "body.md"
         token: ${{ secrets.GITHUB_TOKEN }}
         prerelease: true

diff --git a/v1-scripts/build-src-zip b/v1-scripts/build-src-zip
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cfg=$1
+
+flatname=$(echo "$cfg" | sed 's@/@_@g')
+dirname="$flatname"
+
+set -ex
+
+mkdir -p .zip
+ln -sf ".." ".zip/$dirname-src"
+(cd ".zip" && zip -prq "$flatname-src.zip" "$dirname-src"/*)
diff --git a/v1-scripts/build-zips b/v1-scripts/build-zips
diff --git a/v1-scripts/copy-binaries b/v1-scripts/copy-binaries
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cfg=$1
+env=$2
+out=$3
+
+flatname=$(echo "$cfg" | sed 's@/@_@g')
+
+set -ex
+
+mkdir -p .bin
+cp ".pio/build/$env/$out" ".bin/$flatname.$out"