diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e911f55..a41ad2e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,7 +159,7 @@ jobs: name: Publish Release command: | echo "Creating release for Cider v${APP_VERSION} on the ${CIRCLE_BRANCH} branch." - gh release create "v${APP_VERSION}" --title "Cider Version ${APP_VERSION} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + gh release create "v${APP_VERSION}" --title "Cider Version ${APP_VERSION} (${CIRCLE_BRANCH})" --notes "##Beta Release\nFull changelog unavailable. View branch comparison [here](https://github.com/ciderapp/cider/compare/stable...main).\nThese builds are considered bleeding edge, expect bugs and please do not use this as a respresentation of the full app. Our full support disclaimer can be found [here](https://docs.cider.sh/support/disclaimer#support-nightly-beta-releases)." -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap # Orchestrate our job run sequence workflows: diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index bd66f516..052da01b 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -71,14 +71,6 @@ jobs: - name: Add license to DMG run: npx dmg-license resources/license.json dist/*.dmg - - name: Upload DMG - uses: svenstaro/upload-release-action@v2 - with: - repo_name: ciderapp/cider-releases - repo_token: ${{ secrets.RELEASE_TOKEN }} - file: dist/Cider-${{ env.APP_VERSION }}-universal.dmg - tag: v${{ env.APP_VERSION }} - - name: Upload macOS Latest uses: svenstaro/upload-release-action@v2 with: @@ -105,14 +97,6 @@ jobs: sleep 5m xcrun stapler staple dist/Cider*.pkg || true - - name: Upload PKG - uses: svenstaro/upload-release-action@v2 - with: - repo_name: ciderapp/cider-releases - repo_token: ${{ secrets.RELEASE_TOKEN }} - file: dist/Cider-${{ env.APP_VERSION }}-universal.pkg - tag: v${{ env.APP_VERSION }} - - name: Upload a Build Artifact uses: actions/upload-artifact@v2.2.3 with: @@ -122,7 +106,18 @@ jobs: dist/*.pkg dist/latest-mac.yml + - name: Upload Files (DMG) + uses: svenstaro/upload-release-action@v2 + with: + repo_name: ciderapp/cider-releases + repo_token: ${{ secrets.RELEASE_TOKEN }} + file: dist/Cider-${{ env.APP_VERSION }}-universal.dmg + tag: v${{ env.APP_VERSION }} - - - + - name: Upload Files (PKG) + uses: svenstaro/upload-release-action@v2 + with: + repo_name: ciderapp/cider-releases + repo_token: ${{ secrets.RELEASE_TOKEN }} + file: dist/Cider-${{ env.APP_VERSION }}-universal.pkg + tag: v${{ env.APP_VERSION }} \ No newline at end of file