diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1367300..094beb6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,19 +20,44 @@ jobs: - name: Create release archive run: | mkdir -p ../noctalia-release - # Copy all files except .git and .github rsync -av --exclude='.git' --exclude='.github' ./ ../noctalia-release/ cd .. tar -czf noctalia-${{ github.ref_name }}.tar.gz noctalia-release/ cp noctalia-${{ github.ref_name }}.tar.gz noctalia-latest.tar.gz mv *.tar.gz ${{ github.workspace }}/ + - name: Generate release notes + id: release_notes + run: | + PREV_TAG=$(git describe --tags --abbrev=0 @^ 2>/dev/null || echo "") + RANGE="${PREV_TAG}..HEAD" + + PR_NOTES="" + COMMIT_NOTES="" + + git log $RANGE --pretty=format:"%H|%s|%an" | while IFS='|' read -r SHA MSG AUTHOR; do + SHORT_MSG=$(echo "$MSG" | cut -c1-80) + if [[ "$MSG" =~ Merge\ pull\ request\ \#([0-9]+) ]]; then + PR_NUM="${BASH_REMATCH[1]}" + PR_TITLE=$(echo "$SHORT_MSG" | sed -E "s/Merge pull request #$PR_NUM //") + PR_NOTES+="- [PR #$PR_NUM](https://github.com/${GITHUB_REPOSITORY}/pull/$PR_NUM): $PR_TITLE by $AUTHOR\n" + else + COMMIT_NOTES+="- [$SHA](https://github.com/${GITHUB_REPOSITORY}/commit/$SHA): $SHORT_MSG by $AUTHOR\n" + fi + done + + NOTES="### Merged PRs\n$PR_NOTES\n### Direct commits\n$COMMIT_NOTES" + + echo "RELEASE_NOTES<> $GITHUB_ENV + echo -e "$NOTES" >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV + - name: Create GitHub Release uses: softprops/action-gh-release@v1 with: files: | noctalia-${{ github.ref_name }}.tar.gz noctalia-latest.tar.gz - generate_release_notes: true + body: ${{ env.RELEASE_NOTES }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml index 71f9f64..9dce857 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/SettingsPanel/Tabs/BarTab.qml @@ -42,7 +42,7 @@ ColumnLayout { NToggle { label: "Show Active Window" - description: "Display the title of the currently focused window below the bar" + description: "Display the title of the currently focused window on the left side of the bar" checked: Settings.data.bar.showActiveWindow onToggled: checked => { Settings.data.bar.showActiveWindow = checked diff --git a/Services/GitHubService.qml b/Services/GitHubService.qml index d0159f7..522ca80 100644 --- a/Services/GitHubService.qml +++ b/Services/GitHubService.qml @@ -107,7 +107,7 @@ Singleton { Process { id: versionProcess - command: ["curl", "-s", "https://api.github.com/repos/Ly-sec/Noctalia/releases/latest"] + command: ["curl", "-s", "https://api.github.com/repos/noctalia-dev/noctalia-shell/releases/latest"] stdout: StdioCollector { onStreamFinished: { @@ -139,7 +139,7 @@ Singleton { Process { id: contributorsProcess - command: ["curl", "-s", "https://api.github.com/repos/Ly-sec/Noctalia/contributors?per_page=100"] + command: ["curl", "-s", "https://api.github.com/repos/noctalia-dev/noctalia-shell/contributors?per_page=100"] stdout: StdioCollector { onStreamFinished: {