Skip to content

chore(template-sync): sync to v1.14.0 - #25

Closed
crazyracer98 wants to merge 2 commits into
mainfrom
template-sync/v1.14.0
Closed

crazyracer98 wants to merge 2 commits into
mainfrom
template-sync/v1.14.0

Conversation

@crazyracer98

Copy link
Copy Markdown
Contributor

Syncs from v1.11.6 to v1.14.0 of craftainer/template-base.

Files changed

  • replace: .claude/skills/owasp-scan/SKILL.md
  • replace: .claude/skills/owasp-scan/discover-targets.sh
  • replace: .github/scripts/README.md
  • replace: .github/scripts/__pycache__/template_sync_manifest.cpython-312.pyc
  • replace: .github/scripts/moderate_apply_result.sh
  • replace: .github/scripts/moderate_package_result.sh
  • replace: .github/scripts/prompts/bug-fix.md
  • replace: .github/scripts/prompts/bug-triage.md
  • replace: .github/scripts/prompts/feature-build.md
  • replace: .github/scripts/prompts/feature-triage.md
  • replace: .github/scripts/reset_issue_state.sh
  • replace: .github/scripts/test_moderate_apply_result.py
  • replace: .github/workflows/checks.yml
  • replace: .github/workflows/moderate-bug-fix.yml
  • replace: .github/workflows/moderate-bug-triage.yml
  • replace: .github/workflows/moderate-cleanup.yml
  • replace: .github/workflows/moderate-feature-build.yml
  • replace: .github/workflows/moderate-feature-triage.yml
  • replace: .github/workflows/moderate-setup.yml
  • replace: .github/workflows/release.yml
  • replace: .github/workflows/template-sync.yml
  • replace (removed upstream): .github/scripts/find_moderation_result.sh
  • replace (removed upstream): .github/scripts/test_moderation_scripts.py
  • replace (removed upstream): .github/workflows/moderate-bug-fix-apply.yml
  • replace (removed upstream): .github/workflows/moderate-feature-build-apply.yml
  • merge (clean): .claude/README.md
  • merge (clean): .github/CONTENTS.md
  • merge (clean): .github/renovate.json
  • merge (clean): .github/template-sync-manifest.yml
  • merge (clean): .github/workflows/README.md
  • merge (clean): .gitleaks.toml
  • merge (clean): docs/TEMPLATE.md
  • merge (conflict, needs manual resolution): .pre-commit-config.yaml

Resolve every conflict above before merging: text files have <<<<<<< markers; a binary file has none (it is left at the instance's version).

@crazyracer98

Copy link
Copy Markdown
Contributor Author

Superseded by #27 (sync to v1.14.2, merged), which includes everything in v1.14.0 and v1.14.2.

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