diff --git a/.github/workflows/release-winget.yml b/.github/workflows/release-winget.yml index f1897b431..b3e402fef 100644 --- a/.github/workflows/release-winget.yml +++ b/.github/workflows/release-winget.yml @@ -1,9 +1,19 @@ name: Release to winget on: + workflow_call: + inputs: + release_tag: + description: 'Git tag to release from' + type: string + required: true + secrets: + token: + required: true workflow_dispatch: inputs: release_tag: description: 'Git tag to release from' + type: string required: true jobs: release-winget: @@ -13,5 +23,5 @@ jobs: uses: vedantmgoyal9/winget-releaser@main with: identifier: TriliumNext.Notes - token: ${{ secrets.WINGET_PAT }} + token: ${{ secrets.token }} release-tag: ${{ github.event.inputs.release_tag }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e473a4a7f..77fb1b04e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,14 +53,13 @@ jobs: APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }} - - name: Publish release - uses: softprops/action-gh-release@v2 + - name: Upload the artifact + uses: actions/upload-artifact@v4 with: - draft: true - fail_on_unmatched_files: true - files: upload/*.* + name: release-desktop-${{ matrix.os.name }}-${{ matrix.arch }} + path: upload/*.* - build_linux_server-x64: + build_server: name: Build Linux Server strategy: fail-fast: false @@ -81,9 +80,39 @@ jobs: os: linux arch: ${{ matrix.arch }} + - name: Upload the artifact + uses: actions/upload-artifact@v4 + with: + name: release-server-linux-${{ matrix.arch }} + path: upload/*.* + + publish_release: + name: Publish release + runs-on: ubuntu-latest + needs: + - make-electron + - build_server + steps: + - run: mkdir upload + + - name: Download all artifacts + uses: actions/download-artifact@v4 + with: + merge-multiple: true + pattern: release-* + path: upload + - name: Publish release uses: softprops/action-gh-release@v2 with: - draft: true + draft: false + make_latest: false # ! Make sure this is removed before merging. + body_path: docs/Release Notes/Release Notes/${{ github.ref }}.md fail_on_unmatched_files: true files: upload/*.* + + - name: Publish to winget + uses: ./.github/workflows/release-winget.yml + with: + release_tag: ${{ github.ref }} + token: ${{ secrets.WINGET_PAT }} diff --git a/docs/Release Notes/Release Notes/v0.0.0.md b/docs/Release Notes/Release Notes/v0.0.0.md new file mode 100644 index 000000000..0f44929fa --- /dev/null +++ b/docs/Release Notes/Release Notes/v0.0.0.md @@ -0,0 +1,4 @@ +# v0.0.0! + +This is just a test version to ensure end-to-end functionality of the release process for TriliumNext, +especially in regards to the `winget` auto-PR.