Skip to content

Commit

Permalink
Add appleclang-16 entry and remove environment value logging from pus…
Browse files Browse the repository at this point in the history
…hhenv (#308)

(Flaky S3 test)

Co-authored-by: Bret Ambrose <[email protected]>
  • Loading branch information
bretambrose and Bret Ambrose authored Nov 12, 2024
1 parent c6e3464 commit 49252b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions builder/core/data.py
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
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
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

0 comments on commit 49252b1

Please sign in to comment.