@@ -158,6 +158,7 @@ jobs:
158158 name : fastfetch-linux-aarch64
159159 path : ./fastfetch-*.*
160160
161+ <<<<<<< HEAD
161162 linux-armv7 :
162163 name : Linux-armv7
163164 runs-on : ubuntu-22.04
@@ -313,6 +314,8 @@ jobs:
313314 name : fastfetch-musl-aarch64
314315 path : ./fastfetch-*.*
315316
317+ =======
318+ >>>>>>> 70dcc44e (chore: gpustack update ci)
316319 macos-universal :
317320 name : macOS-universal
318321 runs-on : macos-12
@@ -368,6 +371,7 @@ jobs:
368371 name : fastfetch-macos-universal
369372 path : ./fastfetch-*.*
370373
374+ <<<<<<< HEAD
371375 sunos-amd64 :
372376 runs-on : ubuntu-latest
373377 name : SunOS-amd64
@@ -611,13 +615,16 @@ jobs:
611615 name : fastfetch-windows-i686
612616 path : ./fastfetch-windows-i686.*
613617
618+ =======
619+ >>>>>>> 70dcc44e (chore: gpustack update ci)
614620 release :
615- if : github.event_name == 'push' && github.ref == 'refs/heads/master ' && github.repository == 'fastfetch-cli /fastfetch'
621+ if : github.event_name == 'push' && github.ref == 'refs/heads/gpustack-main ' && github.repository == 'aiwantaozi /fastfetch'
616622 name : Release
617623 runs-on : ubuntu-latest
618624 needs :
619625 - linux-amd64
620626 - linux-aarch64
627+ <<<<<<< HEAD
621628 - linux-armv7
622629 - linux-riscv64
623630 - musl-amd64
@@ -628,21 +635,16 @@ jobs:
628635 - sunos-amd64
629636 - windows-amd64
630637 - windows-i686
638+ =======
639+ - macos-universal
640+ >>>>>>> 70dcc44e (chore: gpustack update ci)
631641 permissions :
632642 contents : write
633643 steps :
634- - name : get latest release version
635- id : get_version_release
636- uses : pozetroninc/github-action-get-latest-release@master
637- with :
638- repository : ${{ github.repository }}
639-
640644 - name : download artifacts
641- if : needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
642645 uses : actions/download-artifact@v4
643646
644647 - name : create release
645- if : needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
646648 uses : ncipollo/release-action@v1
647649 with :
648650 tag : ${{ needs.linux-amd64.outputs.ffversion }}
@@ -652,13 +654,11 @@ jobs:
652654 body : " Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ needs.linux-amd64.outputs.ffversion }}/CHANGELOG.md) for details."
653655
654656 - name : download source tarballs
655- if : needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
656657 run : |
657658 for i in 1 2 3 4 5; do curl -L --remote-name-all --output-dir fastfetch-source --create-dirs https://github.com/${{ github.repository }}/archive/refs/tags/${{ needs.linux-amd64.outputs.ffversion }}.{tar.gz,zip} && break || sleep 5; done
658659 ls fastfetch-*/*
659660
660661 - name : generate release notes
661- if : needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
662662 run : |
663663 echo "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ needs.linux-amd64.outputs.ffversion }}/CHANGELOG.md) for details." > fastfetch-release-notes.md
664664 echo -e "\n---\n\n<details><summary>SHA256SUMs</summary><br>\n\n\`\`\`" >> fastfetch-release-notes.md
@@ -669,7 +669,6 @@ jobs:
669669 echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md
670670
671671 - name : update release body
672- if : needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
673672 uses : ncipollo/release-action@v1
674673 with :
675674 tag : ${{ needs.linux-amd64.outputs.ffversion }}
0 commit comments