Changelog
" >> "$RELEASE_BODY"
+ echo "" >> "$RELEASE_BODY"
+ echo "" >> "$RELEASE_BODY"
+ cat "$PUBLISH_DIR/CHANGELOG" >> "$RELEASE_BODY"
+ echo "
" >> "$RELEASE_BODY"
+ echo " " >> "$RELEASE_BODY"
+ echo "📄 Release body content:"
+ cat "$RELEASE_BODY"
+
- name: Create Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }}
if: env.RELEASE == 'true'
uses: softprops/action-gh-release@v3
@@ -405,7 +475,7 @@ jobs:
name: "RouterOS ${{ env.VERSION }}${{ env.ARCH_EXT }}"
repository: ${{ github.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
- body_path: ${{env.PUBLISH_DIR}}/CHANGELOG
+ body_path: ${{env.BUILD_DIR}}/RELEASE_BODY.md
tag_name: ${{ env.VERSION }}${{ env.ARCH_EXT }}
make_latest: false
prerelease: false
@@ -438,7 +508,6 @@ jobs:
rm -f $PUBLISH_DIR/*.iso
rm -f $PUBLISH_DIR/*.zip.sha256
rm -f $PUBLISH_DIR/*.iso.sha256
- sed -i '1d' $PUBLISH_DIR/CHANGELOG
echo $VERSION $BUILD_TIME | tee $PUBLISH_DIR/info
echo "$CHANNELS" | jq -r '.[]' | while read -r CHANNEL
do
diff --git a/.github/workflows/patch_v7.yml b/.github/workflows/patch_v7.yml
index 8a059f9..6e55a3e 100644
--- a/.github/workflows/patch_v7.yml
+++ b/.github/workflows/patch_v7.yml
@@ -930,8 +930,8 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
body_path: ${{env.BUILD_DIR}}/RELEASE_BODY.md
tag_name: ${{ env.VERSION }}${{ env.ARCH_EXT }}
- make_latest: ${{ contains(env.CHANNELS, 'stable') && matrix.arch == 'x86' }}
- prerelease: ${{ contains(env.CHANNELS,'development') || contains(env.CHANNELS,'testing') }}
+ make_latest: ${{ contains(fromJSON(env.CHANNELS), 'stable') && env.ARCH == 'x86' }}
+ prerelease: ${{ !contains(fromJSON(env.CHANNELS), 'stable') && !contains(fromJSON(env.CHANNELS), 'long-term') }}
files: |
${{env.PUBLISH_DIR}}/*.zip
${{env.PUBLISH_DIR}}/*.zip.sha256