From 71d9fd1c87cfdb8af81396e8e2abef810cf2edd9 Mon Sep 17 00:00:00 2001 From: jLynx Date: Mon, 4 Apr 2022 07:15:24 +1200 Subject: [PATCH 1/5] Update with next --- .github/workflows/create_nightly_release.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml index f217b40cf..c22c5f45d 100644 --- a/.github/workflows/create_nightly_release.yml +++ b/.github/workflows/create_nightly_release.yml @@ -35,6 +35,7 @@ jobs: - name: Checkout uses: actions/checkout@master with: + fetch-depth: 0 ref: next submodules: true - name: Git Sumbodule Update @@ -52,6 +53,14 @@ jobs: - name: Create SD Card ZIP run: | zip -r sdcard.zip sdcard + - name: Create changelog + run: | + CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") + CHANGELOG="${CHANGELOG//'%'/'%25'}" + CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" + CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" + echo "::set-output name=content::$CHANGELOG" + id: changelog - name: Create Release id: create_release uses: actions/create-release@v1 @@ -59,12 +68,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: nightly-tag-${{ steps.date.outputs.date }} - release_name: Nightly-release - ${{ steps.date.outputs.date }} + release_name: Nightly Release - ${{ steps.date.outputs.date }} body: | **Nightly release - ${{ steps.date.outputs.date }}** This build is the latest and greatest, although may not be the most stable as this is a nightly release. - Version: ${{ steps.version_date.outputs.date }} - You can find the changes in this commit ${{ github.sha }} + ## Release notes + ### Revision (${{ steps.version_date.outputs.date }}): + ${{ steps.changelog.outputs.content }} draft: false prerelease: true - name: Upload Firmware Asset @@ -85,5 +95,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./sdcard.zip - asset_name: mayhem_nightly_${{ steps.date.outputs.date }}_COPY_TO_SDCARD.zip - asset_content_type: application/zip + asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_COPY_TO_SDCARD.zip + asset_content_type: application/zip \ No newline at end of file From 719e7d42fd9f5639605b3d628cdd3a05396341e6 Mon Sep 17 00:00:00 2001 From: jLynx Date: Mon, 4 Apr 2022 07:32:55 +1200 Subject: [PATCH 2/5] Removed usernames for the moment --- .github/workflows/create_nightly_release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml index c22c5f45d..e986806a0 100644 --- a/.github/workflows/create_nightly_release.yml +++ b/.github/workflows/create_nightly_release.yml @@ -55,7 +55,8 @@ jobs: zip -r sdcard.zip sdcard - name: Create changelog run: | - CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") + # CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") + CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - %s") CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" From 5627634da1bd35841cd674cb5158453875319582 Mon Sep 17 00:00:00 2001 From: jLynx Date: Mon, 4 Apr 2022 07:33:14 +1200 Subject: [PATCH 3/5] Removed usernames for the moment --- .github/workflows/create_nightly_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml index e986806a0..ca4b7a366 100644 --- a/.github/workflows/create_nightly_release.yml +++ b/.github/workflows/create_nightly_release.yml @@ -55,7 +55,7 @@ jobs: zip -r sdcard.zip sdcard - name: Create changelog run: | - # CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") + # CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") # Commented out as username are currently broken CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - %s") CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" From 1e413d034f0410f675ef851913ed7c49c7936fac Mon Sep 17 00:00:00 2001 From: jLynx Date: Mon, 4 Apr 2022 08:54:43 +1200 Subject: [PATCH 4/5] WIP python --- .github/workflows/changelog.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/changelog.py diff --git a/.github/workflows/changelog.py b/.github/workflows/changelog.py new file mode 100644 index 000000000..81e5c4412 --- /dev/null +++ b/.github/workflows/changelog.py @@ -0,0 +1,28 @@ +import os +import re +import sys + +raw_git = os.popen('git log next --since="5 days" --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read() + + +def compute_username(line): + stripped = re.search(r'(?<=\*)(.*?)(?=\*)', line).group(0) + + pattern = re.compile("[$@+&?].*[$@+&?]") + if pattern.match(stripped): + stripped = re.sub("[$@+&?].*[$@+&?]", "", stripped) + stripped = re.match(r'.+?(?=-)', stripped).group(0) + else: + stripped = re.sub(r'^.*?-', "", stripped) + return "@" + stripped + + +def compile_line(line): + username = compute_username(line) + line = re.sub(r'[*].*[*]', "", line) + line = line.replace("{USERNAME}", username) + return line + + +for row in raw_git.splitlines(): + print(compile_line(row)) From 29d3a0f1dd10b29287b7fca441b71149d95b248e Mon Sep 17 00:00:00 2001 From: jLynx Date: Mon, 4 Apr 2022 09:00:41 +1200 Subject: [PATCH 5/5] Added python script to parse changelog --- .github/workflows/changelog.py | 2 +- .github/workflows/create_nightly_release.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.py b/.github/workflows/changelog.py index 81e5c4412..53780668f 100644 --- a/.github/workflows/changelog.py +++ b/.github/workflows/changelog.py @@ -2,7 +2,7 @@ import os import re import sys -raw_git = os.popen('git log next --since="5 days" --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read() +raw_git = os.popen('git log next --since="24 hours" --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read() def compute_username(line): diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml index ca4b7a366..d68a52a29 100644 --- a/.github/workflows/create_nightly_release.yml +++ b/.github/workflows/create_nightly_release.yml @@ -55,8 +55,7 @@ jobs: zip -r sdcard.zip sdcard - name: Create changelog run: | - # CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") # Commented out as username are currently broken - CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - %s") + CHANGELOG=$(python3 .github/workflows/changelog.py) CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"