Skip to content

Conversation

@m1so
Copy link
Member

@m1so m1so commented Nov 20, 2025

run the job sequentially to prevent Git conflicts from update-config-version action

e.g. main and tagged release trigger CD job(s), the second job gets a conflict as it has checked out the branch before first job's commit has been automatically merged (first action already merged)

Summary by CodeRabbit

  • Chores
    • Improved the release workflow to ensure sequential processing, reducing the risk of conflicts during deployment operations.

✏️ Tip: You can customize this high-level summary in your review settings.

un the job sequentially to prevent Git conflicts from
`update-config-version` action

e.g. main and tagged release trigger CD job(s), the second job gets a
conflict as it has checked out the branch before first job's commit
has been automatically merged (first action already merged)
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Nov 20, 2025

📝 Walkthrough

Walkthrough

A concurrency block has been added to the Release staging job in the GitHub Actions workflow. The configuration specifies group: release-staging and cancel-in-progress: false, ensuring sequential execution of this job and preventing Git conflicts that could arise from concurrent update-config-version actions.

Pre-merge checks

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: adding sequential job execution to prevent Git conflicts during staging releases.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: ASSERTIVE

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 249e9d6 and d9655a7.

📒 Files selected for processing (1)
  • .github/workflows/cd.yml (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (9)
  • GitHub Check: Test - Python 3.11
  • GitHub Check: Test - Python 3.10
  • GitHub Check: Test - Python 3.9
  • GitHub Check: Format
  • GitHub Check: Build and push artifacts for Python 3.11
  • GitHub Check: Build and push artifacts for Python 3.9
  • GitHub Check: Build and push artifacts for Python 3.13
  • GitHub Check: Build and push artifacts for Python 3.10
  • GitHub Check: Build and push artifacts for Python 3.12
🔇 Additional comments (1)
.github/workflows/cd.yml (1)

458-462: Concurrency block correctly addresses the stated race condition.

The job-level concurrency override with group: release-staging and cancel-in-progress: false ensures sequential execution of the release-staging job, preventing Git conflicts from concurrent update-config-version actions when both main and tagged releases trigger simultaneously. The comment clearly explains the rationale.


Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link

📦 Python package built successfully!

  • Version: 1.1.5.dev2+d85450b
  • Wheel: deepnote_toolkit-1.1.5.dev2+d85450b-py3-none-any.whl
  • Install:
    pip install "deepnote-toolkit @ https://deepnote-staging-runtime-artifactory.s3.amazonaws.com/deepnote-toolkit-packages/1.1.5.dev2%2Bd85450b/deepnote_toolkit-1.1.5.dev2%2Bd85450b-py3-none-any.whl"

@codecov
Copy link

codecov bot commented Nov 20, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.92%. Comparing base (249e9d6) to head (d9655a7).
⚠️ Report is 1 commits behind head on main.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##             main      #37   +/-   ##
=======================================
  Coverage   72.92%   72.92%           
=======================================
  Files          94       94           
  Lines        5175     5175           
  Branches      755      755           
=======================================
  Hits         3774     3774           
  Misses       1157     1157           
  Partials      244      244           
Flag Coverage Δ
combined 72.92% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@deepnote-bot
Copy link

🚀 Review App Deployment Started

📝 Description 🌐 Link / Info
🌍 Review application ra-37
🔑 Sign-in URL Click to sign-in
📊 Application logs View logs
🔄 Actions Click to redeploy
🚀 ArgoCD deployment View deployment
Last deployed 2025-11-20 16:12:16 (UTC)
📜 Deployed commit 5fc964a704153a71052676e74e4753465db979b3
🛠️ Toolkit version d85450b

@m1so m1so marked this pull request as ready for review November 21, 2025 11:12
@m1so m1so requested a review from a team as a code owner November 21, 2025 11:12
@m1so m1so merged commit 3afc8fa into main Nov 21, 2025
35 checks passed
@m1so m1so deleted the mb/fix-release-to-staging-concurrency branch November 21, 2025 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants