Merge branch 'rebuild' of github.com:noctalia-dev/noctalia-shell into rebuild
This commit is contained in:
commit
7791ee3c0d
3 changed files with 30 additions and 5 deletions
29
.github/workflows/release.yml
vendored
29
.github/workflows/release.yml
vendored
|
|
@ -20,19 +20,44 @@ jobs:
|
||||||
- name: Create release archive
|
- name: Create release archive
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ../noctalia-release
|
mkdir -p ../noctalia-release
|
||||||
# Copy all files except .git and .github
|
|
||||||
rsync -av --exclude='.git' --exclude='.github' ./ ../noctalia-release/
|
rsync -av --exclude='.git' --exclude='.github' ./ ../noctalia-release/
|
||||||
cd ..
|
cd ..
|
||||||
tar -czf noctalia-${{ github.ref_name }}.tar.gz noctalia-release/
|
tar -czf noctalia-${{ github.ref_name }}.tar.gz noctalia-release/
|
||||||
cp noctalia-${{ github.ref_name }}.tar.gz noctalia-latest.tar.gz
|
cp noctalia-${{ github.ref_name }}.tar.gz noctalia-latest.tar.gz
|
||||||
mv *.tar.gz ${{ github.workspace }}/
|
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<<EOF" >> $GITHUB_ENV
|
||||||
|
echo -e "$NOTES" >> $GITHUB_ENV
|
||||||
|
echo "EOF" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Create GitHub Release
|
- name: Create GitHub Release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
noctalia-${{ github.ref_name }}.tar.gz
|
noctalia-${{ github.ref_name }}.tar.gz
|
||||||
noctalia-latest.tar.gz
|
noctalia-latest.tar.gz
|
||||||
generate_release_notes: true
|
body: ${{ env.RELEASE_NOTES }}
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NToggle {
|
NToggle {
|
||||||
label: "Show Active Window"
|
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
|
checked: Settings.data.bar.showActiveWindow
|
||||||
onToggled: checked => {
|
onToggled: checked => {
|
||||||
Settings.data.bar.showActiveWindow = checked
|
Settings.data.bar.showActiveWindow = checked
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ Singleton {
|
||||||
Process {
|
Process {
|
||||||
id: versionProcess
|
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 {
|
stdout: StdioCollector {
|
||||||
onStreamFinished: {
|
onStreamFinished: {
|
||||||
|
|
@ -139,7 +139,7 @@ Singleton {
|
||||||
Process {
|
Process {
|
||||||
id: contributorsProcess
|
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 {
|
stdout: StdioCollector {
|
||||||
onStreamFinished: {
|
onStreamFinished: {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue