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.

Sign up for GitHub

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

Add appleclang-16 entry and remove environment value logging from pushhenv #308

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Add appleclang-16 entry and remove environment value logging from pushhenv #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb5301
Add appleclang-16 entry and remove environment value logging from pus…
Nov 12, 2024
513934e
Also update run action's setenv
Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions builder/core/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ class PKG_TOOLS(Enum):
'13': {},
'14': {},
'15': {},
'16': {},
},
},
'clang': {
Expand Down
4 changes: 2 additions & 2 deletions builder/core/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,10 @@ def _pushenv(project, key, env):
env.shell.pushenv()
# set project env defaults
for var, value in project.config.get('env', {}).items():
env.shell.setenv(var, value)
env.shell.setenv(var, value, is_secret=True)
# specific env defaults
for var, value in project.config.get(key, {}).items():
env.shell.setenv(var, value)
env.shell.setenv(var, value, is_secret=True)


def _popenv(env):
Expand Down
2 changes: 1 addition & 1 deletion builder/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def run_action(action, env):
# Set build environment from config
env.shell.pushenv()
for var, value in getattr(env, 'env', {}).items():
env.shell.setenv(var, value)
env.shell.setenv(var, value, is_secret=True)

if isinstance(action, str):
action_cls = Scripts.find_action(action)
Expand Down
Loading