Skip to content

Propagate changes from main into development #986

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

Merged
Wikid82 merged 5 commits into from
Apr 27, 2026
Merged

Propagate changes from main into development #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4034a2a
Merge pull request #967 from Wikid82/feature/beta-release
Wikid82 Apr 23, 2026
e66146e
fix: update renovate configuration to remove feature branch pattern a…
Wikid82 Apr 27, 2026
48df8c8
fix: remove downstream propagation logic for development branch in wo…
Wikid82 Apr 27, 2026
727a865
Merge branch 'main' into nightly
Wikid82 Apr 27, 2026
dc96507
Merge pull request #984 from Wikid82/nightly
Wikid82 Apr 27, 2026
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
14 changes: 14 additions & 0 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,20 @@
"depNameTemplate": "golang/go",
"datasourceTemplate": "golang-version",
"versioningTemplate": "semver"
},
{
"customType": "regex",
"description": "Track golangci-lint version in quality checks workflow",
"managerFilePatterns": [
"/^\\.github/workflows/quality-checks\\.yml$/"
],
"matchStrings": [
"# renovate: datasource=github-releases depName=golangci/golangci-lint\\n\\s+version: v(?<currentValue>[^\\s]+)"
Copy link

Copilot AI Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regex manager appears unlikely to match the current .github/workflows/quality-checks.yml: that workflow currently has version: latest for golangci-lint-action and does not include the # renovate: datasource=github-releases depName=golangci/golangci-lint marker comment. As a result, Renovate won’t track/update the golangci-lint version as intended; either update the workflow to pin version: vX.Y.Z with the marker, or adjust the regex to match the existing pattern you want Renovate to manage.

Suggested change
"# renovate: datasource=github-releases depName=golangci/golangci-lint\\n\\s+version: v(?<currentValue>[^\\s]+)"
"\\s+version:\\s+(?:latest|v(?<currentValue>[0-9]+\\.[0-9]+\\.[0-9]+))"

Copilot uses AI. Check for mistakes.
],
"depNameTemplate": "golangci/golangci-lint",
"datasourceTemplate": "github-releases",
"versioningTemplate": "semver",
"extractVersionTemplate": "^v(?<version>.*)"
Copy link

Copilot AI Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extractVersionTemplate is missing an end-of-string anchor. Elsewhere in this file similar templates use ^v(?<version>.*)$ (e.g., Syft/Grype). Consider adding $ here as well to avoid accidental partial matches if the captured string ever contains trailing characters.

Suggested change
"extractVersionTemplate": "^v(?<version>.*)"
"extractVersionTemplate": "^v(?<version>.*)$"

Copilot uses AI. Check for mistakes.
}
],

Expand Down
24 changes: 1 addition & 23 deletions .github/workflows/propagate-changes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,27 +183,5 @@ jobs:
core.info('Push originated from development (excluded). Skipping propagation back to development.');
}
} else if (currentBranch === 'development') {
// Development -> Feature/Hotfix branches (The Pittsburgh Model)
// We propagate changes from dev DOWN to features/hotfixes so they stay up to date.

const branches = await github.paginate(github.rest.repos.listBranches, {
owner: context.repo.owner,
repo: context.repo.repo,
});

// Filter for feature/* and hotfix/* branches using regex
// AND exclude the branch that just got merged in (if any)
const targetBranches = branches
.map(b => b.name)
.filter(name => {
const isTargetType = /^feature\/|^hotfix\//.test(name);
const isExcluded = (name === excludedBranch);
return isTargetType && !isExcluded;
});

core.info(`Found ${targetBranches.length} target branches (excluding '${excludedBranch || 'none'}'): ${targetBranches.join(', ')}`);

for (const targetBranch of targetBranches) {
await createPR('development', targetBranch);
}
core.info('Push to development detected. No downstream propagation configured.');
}
Comment on lines 185 to 187
Copy link

Copilot AI Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workflow still runs on workflow_run events for the development branch, but with the downstream propagation logic removed it becomes a no-op run that only logs. If downstream propagation is intentionally disabled, consider removing development from the workflow_run.branches filter and/or the job-level if condition to avoid unnecessary workflow executions (and any associated permissions/secret exposure).

Copilot uses AI. Check for mistakes.
Loading