Skip to content

🔄 synced file(s) with upbound/sa-up#120

Closed
upbound-bot wants to merge 2 commits into
mainfrom
repo-sync/sa-up/default
Closed

🔄 synced file(s) with upbound/sa-up#120
upbound-bot wants to merge 2 commits into
mainfrom
repo-sync/sa-up/default

Conversation

@upbound-bot

@upbound-bot upbound-bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

synced local file(s) with upbound/sa-up.

Changed files
  • synced local directory .github/workflows with remote directory gitops/shared-files/functions/workflows

This PR was created automatically by the repo-file-sync-action workflow run #29826916605

@ytsarev

ytsarev commented Jul 21, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 21, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in .github/workflows/ci.yml. The conflict was between GOLANGCI_VERSION: 'v2.8.0' (from the sync branch) and GOLANGCI_VERSION: 'v2.12.2' (already on main). I kept the newer v2.12.2 from main. The GO_VERSION update to '1.26.0' from the sync is preserved. Merge commit: 396e501.

Copilot AI requested a review from ytsarev July 21, 2026 13:04
@ytsarev ytsarev closed this Jul 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants