Skip to content

improve envs#6834

Merged
waruqi merged 2 commits intodevfrom
env
Sep 20, 2025
Merged

improve envs#6834
waruqi merged 2 commits intodevfrom
env

Conversation

@waruqi
Copy link
Member

@waruqi waruqi commented Sep 20, 2025

  • Before adding new features and new modules, please go to issues to submit the relevant feature description first.
  • Write good commit messages and use the same coding conventions as the rest of the project.
  • Please commit code to dev branch and we will merge into master branch in feature
  • Ensure your edited codes with four spaces instead of TAB.

  • 增加新特性和新模块之前,请先到issues提交相关特性说明,经过讨论评估确认后,再进行相应的代码提交,避免做无用工作。
  • 编写友好可读的提交信息,并使用与工程代码相同的代码规范,代码请用4个空格字符代替tab缩进。
  • 请提交代码到dev分支,如果通过,我们会在特定时间合并到master分支上。
  • 为了规范化提交日志的格式,commit消息,不要用中文,请用英文描述。

@waruqi waruqi added this to the v3.0.3 milestone Sep 20, 2025
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @waruqi, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors the environment variable management within xmake's package and repository actions. The primary goal is to streamline the _package_getenvs function, making the process of loading and applying environment variables from both explicit environment files and dynamically generated package requirements more robust and easier to understand. These changes enhance the consistency of environment setup by clarifying when and how different types of environment variables are integrated.

Highlights

  • Refactored Environment Variable Logic: The _package_getenvs function has been significantly refactored to improve the handling and application of environment variables from both explicit environment files and required packages.
  • Consolidated Conditional Flows: The logic for processing environment files and dynamically generated package requirements has been unified into a single, clearer conditional block, reducing redundancy.
  • Improved Conditionals for Env Application: The application of toolchain and target-specific environment variables is now governed by more precise conditions, ensuring they are only applied when relevant to the project or environment files.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request refactors the _package_getenvs function to simplify logic and reduce code duplication. While the refactoring is a good improvement, it introduces a critical bug that causes xrepo env to fail when run inside an existing project. Specifically, it unconditionally creates a temporary project, losing the context of the current one. I've provided a comment with a suggested fix to address this issue.

if has_envfile then
_enter_project()
if has_envfiles or has_packages then
_enter_project()
Copy link
Contributor

Choose a reason for hiding this comment

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

critical

Calling _enter_project() unconditionally here is incorrect. If xrepo env is run inside an existing project without the -b or --bind option, this call will switch to a temporary project, losing the context of the current project. This is especially problematic for commands like xrepo env shell which are intended to operate on the current project's environment.

_enter_project() should only be called when not already in a project context (i.e., when in_project is false).

        if not in_project then
            _enter_project()
        end

@waruqi waruqi merged commit a97d95f into dev Sep 20, 2025
44 checks passed
@waruqi waruqi deleted the env branch September 20, 2025 10:30
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.

1 participant