From f6f7a80bfa139a7dc9351c65818806e9b564b032 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 7 Nov 2025 00:30:10 -0700 Subject: [PATCH] Create sentry releases in after_release (#42169) This had been moved to auto-release preview, and was not running for stable. Closes #ISSUE Release Notes: - N/A --- .github/workflows/after_release.yml | 27 +++++++++++-------- .github/workflows/release.yml | 8 ------ .../src/tasks/workflows/after_release.rs | 23 ++++++++++++---- tooling/xtask/src/tasks/workflows/release.rs | 1 - 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/.github/workflows/after_release.yml b/.github/workflows/after_release.yml index 6732a0921444fe3b2eeb0541e89eac0009956a7f..805759536bf5cde902ed6a5c1263f197d2e3cac2 100644 --- a/.github/workflows/after_release.yml +++ b/.github/workflows/after_release.yml @@ -6,18 +6,7 @@ on: types: - published jobs: - rebuild_releases_page: - if: github.repository_owner == 'zed-industries' - runs-on: namespace-profile-2x4-ubuntu-2404 - steps: - - name: after_release::rebuild_releases_page - run: 'curl https://zed.dev/api/revalidate-releases -H "Authorization: Bearer ${RELEASE_NOTES_API_TOKEN}"' - shell: bash -euxo pipefail {0} - env: - RELEASE_NOTES_API_TOKEN: ${{ secrets.RELEASE_NOTES_API_TOKEN }} post_to_discord: - needs: - - rebuild_releases_page if: github.repository_owner == 'zed-industries' runs-on: namespace-profile-2x4-ubuntu-2404 steps: @@ -67,3 +56,19 @@ jobs: identifier: ${{ steps.set-package-name.outputs.PACKAGE_NAME }} max-versions-to-keep: 5 token: ${{ secrets.WINGET_TOKEN }} + create_sentry_release: + if: github.repository_owner == 'zed-industries' + runs-on: namespace-profile-2x4-ubuntu-2404 + steps: + - name: steps::checkout_repo + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + with: + clean: false + - name: release::create_sentry_release + uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c + with: + environment: production + env: + SENTRY_ORG: zed-dev + SENTRY_PROJECT: zed + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f047f3064a6828d6121169f7f9cca189d5dbe73f..6cfc84076d0821693c45b482a409688349151bb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -478,14 +478,6 @@ jobs: shell: bash -euxo pipefail {0} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: release::create_sentry_release - uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c - with: - environment: production - env: - SENTRY_ORG: zed-dev - SENTRY_PROJECT: zed - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} concurrency: group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }} cancel-in-progress: true diff --git a/tooling/xtask/src/tasks/workflows/after_release.rs b/tooling/xtask/src/tasks/workflows/after_release.rs index 7d82b53eee480a1e381cceaadc649a57fa8e7e39..9a930abf09fcc9ac32a2cc554e9c27075d7ae752 100644 --- a/tooling/xtask/src/tasks/workflows/after_release.rs +++ b/tooling/xtask/src/tasks/workflows/after_release.rs @@ -1,23 +1,25 @@ use gh_workflow::*; use crate::tasks::workflows::{ - runners, - steps::{NamedJob, dependant_job, named}, + release, runners, + steps::{NamedJob, checkout_repo, dependant_job, named}, vars::{self, StepOutput}, }; pub fn after_release() -> Workflow { - let refresh_zed_dev = rebuild_releases_page(); - let post_to_discord = post_to_discord(&[&refresh_zed_dev]); + // let refresh_zed_dev = rebuild_releases_page(); + let post_to_discord = post_to_discord(&[]); let publish_winget = publish_winget(); + let create_sentry_release = create_sentry_release(); named::workflow() .on(Event::default().release(Release::default().types(vec![ReleaseType::Published]))) - .add_job(refresh_zed_dev.name, refresh_zed_dev.job) .add_job(post_to_discord.name, post_to_discord.job) .add_job(publish_winget.name, publish_winget.job) + .add_job(create_sentry_release.name, create_sentry_release.job) } +#[allow(unused)] fn rebuild_releases_page() -> NamedJob { named::job( Job::default() @@ -121,3 +123,14 @@ fn publish_winget() -> NamedJob { .add_step(winget_releaser(&package_name)), ) } + +fn create_sentry_release() -> NamedJob { + let job = Job::default() + .runs_on(runners::LINUX_SMALL) + .cond(Expression::new( + "github.repository_owner == 'zed-industries'", + )) + .add_step(checkout_repo()) + .add_step(release::create_sentry_release()); + named::job(job) +} diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs index f0807e22e4b45c803a9400d4584c465576e6fedc..5569f205403b0c2053dacb5d0b728454186e1db9 100644 --- a/tooling/xtask/src/tasks/workflows/release.rs +++ b/tooling/xtask/src/tasks/workflows/release.rs @@ -111,7 +111,6 @@ fn auto_release_preview(deps: &[&NamedJob; 1]) -> NamedJob { ) .add_env(("GITHUB_TOKEN", vars::GITHUB_TOKEN)), ) - .add_step(create_sentry_release()), ) }