Skip to content

Propagate changes from main into development#986

Merged
Wikid82 merged 5 commits intodevelopmentfrom
main
Apr 27, 2026
Merged

Propagate changes from main into development#986
Wikid82 merged 5 commits intodevelopmentfrom
main

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Automated PR to propagate changes from main into development.

Triggered by push to main.

@github-advanced-security
Copy link
Copy Markdown
Contributor

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@Wikid82 Wikid82 marked this pull request as ready for review April 27, 2026 18:26
Copilot AI review requested due to automatic review settings April 27, 2026 18:26
@Wikid82 Wikid82 merged commit a821c61 into development Apr 27, 2026
72 of 74 checks passed
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Automated maintenance PR that adjusts branch propagation behavior and extends Renovate configuration.

Changes:

  • Disable downstream propagation from development to feature/* / hotfix/* branches in the propagation workflow.
  • Add a Renovate customManagers regex entry intended to track the golangci-lint version used by the quality checks workflow.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File Description
.github/workflows/propagate-changes.yml Removes dev→feature/hotfix PR creation; leaves a log-only behavior on development runs.
.github/renovate.json Adds a regex custom manager intended to update the golangci-lint version in quality-checks.yml.

Comment on lines 185 to 187
} 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.');
}
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.
Comment thread .github/renovate.json
"/^\\.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.
Comment thread .github/renovate.json
"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.
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