@@ -137,7 +137,7 @@ jobs:
137137 mkdir build
138138 cd build
139139 curl -L -o octopi.zip ${{ env.OCTOPI_URL }}
140-
140+
141141 unzip octopi.zip
142142 rm octopi.zip
143143
@@ -148,22 +148,25 @@ jobs:
148148 run : |
149149 now=$(date +"%Y%m%d%H%M%S")
150150
151- RELEASE_NAME="OctoPi ${{ env.OCTOPI_VERSION }} with OctoPrint ${{ env.OCTOPRINT_VERSION }} (build $now)"
151+ RELEASE_BUILD="build $now"
152+ [ "$GITHUB_REF_NAME" != "main" ] && RELEASE_BUILD="$RELEASE_BUILD from- branch $GITHUB_REF_NAME"
153+
154+ RELEASE_NAME="OctoPi ${{ env.OCTOPI_VERSION }} with OctoPrint ${{ env.OCTOPRINT_VERSION }} ($RELEASE_BUILD)"
152155 echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
153156
154157 RELEASE_TAG="${{ env.OCTOPI_VERSION }}-${{ env.OCTOPRINT_VERSION }}-$now"
155158 echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_ENV
156-
159+
157160 # release body
158161
159162 cat <<EOF > ./build/release.md
160-
163+
161164 * OctoPi ${{ env.OCTOPI_VERSION }}
162165 * OctoPrint ${{ env.OCTOPRINT_VERSION }}
163166 * Latest kernel & bootloader
164167 * Latest libcamera-apps
165- * Slight documentation changes in included config files
166-
168+ * New camera-streamer based webcam stack
169+
167170 Created with [CustoPiZer](https://github.com/OctoPrint/CustoPiZer)
168171
169172 <!-- mark:untested -->
@@ -175,11 +178,11 @@ jobs:
175178 workspace : " ${{ github.workspace }}/build"
176179 scripts : " ${{ github.workspace }}/scripts"
177180 environment : ' { "OCTOPRINT_VERSION": "${{ env.OCTOPRINT_VERSION }}", "RELEASE_TAG": "${{ env.RELEASE_TAG }}" }'
178-
181+
179182 - name : " ✏ Rename image"
180183 run : |
181184 RELEASE_TAG="${{ env.RELEASE_TAG }}"
182-
185+
183186 IMAGE="octopi-$RELEASE_TAG.img"
184187 echo "IMAGE=$IMAGE" >> $GITHUB_ENV
185188
0 commit comments