Skip to content

Commit ae5f860

Browse files
Copilotpelikhan
authored andcommitted
Merge branch 'main' into copilot/integrate-awf-for-claude
Resolved merge conflicts: - pkg/workflow/compiler_yaml_main_job.go: Added both Claude and Codex firewall log collection steps - pkg/workflow/domains.go: Added ClaudeDefaultDomains alongside new CodexDefaultDomains and merged domain functions - pkg/workflow/domains_test.go: Added tests for both Claude and Codex domain functions - pkg/workflow/firewall.go: Updated comment to include all supported engines Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
1 parent ffd21c3 commit ae5f860

19 files changed

Lines changed: 274 additions & 382 deletions

.github/workflows/campaign-generator.lock.yml

Lines changed: 14 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/changeset.lock.yml

Lines changed: 13 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/close-old-discussions.lock.yml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)