From 2d9a4e530b130be0ca907316b7861931ced00df4 Mon Sep 17 00:00:00 2001 From: Johnathan Baird Date: Sat, 23 Dec 2023 12:05:04 -0600 Subject: [PATCH 1/4] Updates Pre release CI to run the release drafter --- .github/workflows/CI-pre-release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CI-pre-release.yml b/.github/workflows/CI-pre-release.yml index da3d0a1a30..d5f0bf5ffc 100644 --- a/.github/workflows/CI-pre-release.yml +++ b/.github/workflows/CI-pre-release.yml @@ -17,3 +17,7 @@ jobs: needs: [swiftlint, test] uses: ./.github/workflows/pre-release.yml secrets: inherit + ReleaseDrafter: + name: Release Drafter + needs: [swiftlint,test,deploy] + uses: ./.github/workflows/release-drafter.yml From 13b6fc9b694138ab6d845e82c2b5ec521eda447c Mon Sep 17 00:00:00 2001 From: Johnathan Baird Date: Mon, 8 Jan 2024 17:13:07 -0600 Subject: [PATCH 2/4] Testing pre relase and drafter --- .github/workflows/CI-pre-release.yml | 4 ---- .github/workflows/pre-release.yml | 12 ++++++++++++ .github/workflows/release-drafter.yml | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI-pre-release.yml b/.github/workflows/CI-pre-release.yml index d5f0bf5ffc..da3d0a1a30 100644 --- a/.github/workflows/CI-pre-release.yml +++ b/.github/workflows/CI-pre-release.yml @@ -17,7 +17,3 @@ jobs: needs: [swiftlint, test] uses: ./.github/workflows/pre-release.yml secrets: inherit - ReleaseDrafter: - name: Release Drafter - needs: [swiftlint,test,deploy] - uses: ./.github/workflows/release-drafter.yml diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 404ffe1481..0528733dbe 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -5,9 +5,19 @@ on: workflow_call: jobs: + update_release_draft: + runs-on: ubuntu-latest + outputs: + release_draft: ${{ steps.release.outputs.body }} + steps: + - id: release + uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} pre-release: name: Build and Publish Pre-release runs-on: [self-hosted, macOS] + needs: [update_release_draft] steps: - name: Checkout repository uses: actions/checkout@v3 @@ -117,7 +127,9 @@ jobs: SPARKLE_LINK: "https://github.com/CodeEditApp/CodeEdit" APP_VERSION: ${{ env.APP_VERSION }} APP_BUILD: ${{ env.APP_BUILD }} + RELEASE_NOTE: ${{needs.update_release_draft.outputs.release_draft}} run: | + echo "${{ env.RELEASE_NOTE }}" SPARKLE_BIN="$RUNNER_TEMP/DerivedData/SourcePackages/artifacts/sparkle/Sparkle/bin" SPARKLE_ARCHIVE="$RUNNER_TEMP/Sparkle_Archive" echo -n "$SPARKLE_KEY" | tee "$RUNNER_TEMP/sparkle_key" diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index bd84de36b0..c20ba26071 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -8,7 +8,10 @@ on: jobs: update_release_draft: runs-on: ubuntu-latest + outputs: + release_draft: ${{ steps.release.outputs.body }} steps: - - uses: release-drafter/release-drafter@v5 + - id: release + uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 349308aa6fe4e8f8594c788dbb28a351145742dd Mon Sep 17 00:00:00 2001 From: Johnathan Baird Date: Mon, 8 Jan 2024 21:04:24 -0600 Subject: [PATCH 3/4] updating pre release and sparkle. --- .github/workflows/pre-release.yml | 1 + CodeEdit.xcodeproj/project.pbxproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 0528733dbe..c274b5bb01 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -137,6 +137,7 @@ jobs: cp "$RUNNER_TEMP/CodeEdit-$REV.dmg" "$SPARKLE_ARCHIVE" SPARKLE_SIG=$("$SPARKLE_BIN/sign_update" --ed-key-file "$RUNNER_TEMP/sparkle_key" "$SPARKLE_ARCHIVE/CodeEdit-$REV.dmg" | cut -d\" -f2) "$SPARKLE_BIN/generate_appcast" --ed-key-file "$RUNNER_TEMP/sparkle_key" --download-url-prefix "${{ env.SPARKLE_DL_PREFIX }}/${{ env.APP_VERSION }}-alpha.${{ env.APP_BUILD }}/" --link "$SPARKLE_LINK" --channel "$SPARKLE_CHANNEL" --maximum-deltas 0 "$SPARKLE_ARCHIVE" + xmlstarlet ed --inplace -s //item -t elem -n description\ sparkle:format='"plain-text"' -v "${{ env.RELEASE_NOTE }}" ${{ RUNNER.TEMP }}/Sparkle_Archive/appcast.xml ############################ # Publish Pre Release diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj index fdf9a6dde8..8c695557c1 100644 --- a/CodeEdit.xcodeproj/project.pbxproj +++ b/CodeEdit.xcodeproj/project.pbxproj @@ -4422,7 +4422,7 @@ repositoryURL = "https://github.com/sparkle-project/Sparkle.git"; requirement = { kind = exactVersion; - version = 2.3.0; + version = 2.5.2; }; }; 6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */ = { From c6b17f397e0aaa9431429c849fec6c56c9b8dbec Mon Sep 17 00:00:00 2001 From: Johnathan Baird Date: Mon, 8 Jan 2024 22:21:50 -0600 Subject: [PATCH 4/4] Austin and I fixing release notes --- .github/workflows/CI-pre-release.yml | 4 ++++ .github/workflows/pre-release.yml | 13 ------------- .github/workflows/release-drafter.yml | 2 -- CodeEdit.xcodeproj/project.pbxproj | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/CI-pre-release.yml b/.github/workflows/CI-pre-release.yml index da3d0a1a30..7dc8a9385c 100644 --- a/.github/workflows/CI-pre-release.yml +++ b/.github/workflows/CI-pre-release.yml @@ -17,3 +17,7 @@ jobs: needs: [swiftlint, test] uses: ./.github/workflows/pre-release.yml secrets: inherit + ReleaseDrafter: + name: Release Drafter + needs: [swiftlint, test, deploy] + uses: ./.github/workflows/release-drafter.yml diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index c274b5bb01..404ffe1481 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -5,19 +5,9 @@ on: workflow_call: jobs: - update_release_draft: - runs-on: ubuntu-latest - outputs: - release_draft: ${{ steps.release.outputs.body }} - steps: - - id: release - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} pre-release: name: Build and Publish Pre-release runs-on: [self-hosted, macOS] - needs: [update_release_draft] steps: - name: Checkout repository uses: actions/checkout@v3 @@ -127,9 +117,7 @@ jobs: SPARKLE_LINK: "https://github.com/CodeEditApp/CodeEdit" APP_VERSION: ${{ env.APP_VERSION }} APP_BUILD: ${{ env.APP_BUILD }} - RELEASE_NOTE: ${{needs.update_release_draft.outputs.release_draft}} run: | - echo "${{ env.RELEASE_NOTE }}" SPARKLE_BIN="$RUNNER_TEMP/DerivedData/SourcePackages/artifacts/sparkle/Sparkle/bin" SPARKLE_ARCHIVE="$RUNNER_TEMP/Sparkle_Archive" echo -n "$SPARKLE_KEY" | tee "$RUNNER_TEMP/sparkle_key" @@ -137,7 +125,6 @@ jobs: cp "$RUNNER_TEMP/CodeEdit-$REV.dmg" "$SPARKLE_ARCHIVE" SPARKLE_SIG=$("$SPARKLE_BIN/sign_update" --ed-key-file "$RUNNER_TEMP/sparkle_key" "$SPARKLE_ARCHIVE/CodeEdit-$REV.dmg" | cut -d\" -f2) "$SPARKLE_BIN/generate_appcast" --ed-key-file "$RUNNER_TEMP/sparkle_key" --download-url-prefix "${{ env.SPARKLE_DL_PREFIX }}/${{ env.APP_VERSION }}-alpha.${{ env.APP_BUILD }}/" --link "$SPARKLE_LINK" --channel "$SPARKLE_CHANNEL" --maximum-deltas 0 "$SPARKLE_ARCHIVE" - xmlstarlet ed --inplace -s //item -t elem -n description\ sparkle:format='"plain-text"' -v "${{ env.RELEASE_NOTE }}" ${{ RUNNER.TEMP }}/Sparkle_Archive/appcast.xml ############################ # Publish Pre Release diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index c20ba26071..733575d15d 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -8,8 +8,6 @@ on: jobs: update_release_draft: runs-on: ubuntu-latest - outputs: - release_draft: ${{ steps.release.outputs.body }} steps: - id: release uses: release-drafter/release-drafter@v5 diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj index 8c695557c1..fdf9a6dde8 100644 --- a/CodeEdit.xcodeproj/project.pbxproj +++ b/CodeEdit.xcodeproj/project.pbxproj @@ -4422,7 +4422,7 @@ repositoryURL = "https://github.com/sparkle-project/Sparkle.git"; requirement = { kind = exactVersion; - version = 2.5.2; + version = 2.3.0; }; }; 6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */ = {