Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prevent subsequent builds from failing when fetching translations #4485

Merged
merged 2 commits into from
Mar 1, 2025

Conversation

matt-fidd
Copy link
Contributor

This stops subsequent builds failing when pulling the transactions repo in.

$ yarn build:browser
Updating translations...
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
$ pwd
/Users/matt/actual/packages/desktop-client/locale

$ git status --short --branch .
## main...origin/main
 D ar.json
 D ca.json
 D cs.json
 D da.json
 D el.json
 D fi.json
 D hu.json
 D id.json
 D it.json
 D lt.json
 D nb-NO.json
 D pl.json
 D pt.json
 D ru.json
 D sv.json
 D ta.json
 D tr.json
 D zh-Hans.json
 D zh-Hant.json

@actual-github-bot actual-github-bot bot changed the title prevent subsequent builds from failing when fetching translations [WIP] prevent subsequent builds from failing when fetching translations Mar 1, 2025
@matt-fidd matt-fidd changed the title [WIP] prevent subsequent builds from failing when fetching translations prevent subsequent builds from failing when fetching translations Mar 1, 2025
Copy link

netlify bot commented Mar 1, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 029c836
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/67c266bb113de7000987f64e
😎 Deploy Preview https://deploy-preview-4485.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

coderabbitai bot commented Mar 1, 2025

Walkthrough

The pull request updates the scripts in both bin/package-browser and bin/package-electron. In each script, a new command git checkout . is introduced immediately after checking for the existence of the packages/desktop-client/locale directory and right before executing the git pull command. This addition discards any local modifications in the locale directory, ensuring that the working directory is reset to the last committed state before fetching new changes from the remote repository. No changes were made to the declarations of exported or public entities.

Possibly related PRs

Suggested labels

:sparkles: Merged

Suggested reviewers

  • jfdoming
  • youngcw

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b0deedb and 029c836.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4485.md is excluded by !**/*.md
📒 Files selected for processing (2)
  • bin/package-browser (1 hunks)
  • bin/package-electron (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: build (macos-latest)
  • GitHub Check: build (windows-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Analyze
  • GitHub Check: Wait for Netlify build to finish
🔇 Additional comments (2)
bin/package-browser (1)

12-12: Effective solution for preventing build failures due to unstaged translation changes.

This addition of git checkout . properly addresses the PR objective by ensuring that any unstaged changes in the translations directory are discarded before performing the git pull. This resolves the specific error messages mentioned in the PR description:

error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
bin/package-electron (1)

45-45: Correct implementation of the same fix in the electron packaging script.

The addition of git checkout . here mirrors the change in bin/package-browser, ensuring consistent handling of unstaged changes across both packaging scripts. This will effectively prevent the build failures described in the PR.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Member

@jfdoming jfdoming left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice fix!

@matt-fidd matt-fidd merged commit 1425671 into actualbudget:master Mar 1, 2025
20 checks passed
@matt-fidd matt-fidd deleted the reset-translations branch March 1, 2025 02:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants