Skip to content

Commit 727a865

Browse files
authored
Merge branch 'main' into nightly
2 parents 418cc64 + 48df8c8 commit 727a865

2 files changed

Lines changed: 15 additions & 23 deletions

File tree

.github/renovate.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,20 @@
242242
"depNameTemplate": "golang/go",
243243
"datasourceTemplate": "golang-version",
244244
"versioningTemplate": "semver"
245+
},
246+
{
247+
"customType": "regex",
248+
"description": "Track golangci-lint version in quality checks workflow",
249+
"managerFilePatterns": [
250+
"/^\\.github/workflows/quality-checks\\.yml$/"
251+
],
252+
"matchStrings": [
253+
"# renovate: datasource=github-releases depName=golangci/golangci-lint\\n\\s+version: v(?<currentValue>[^\\s]+)"
254+
],
255+
"depNameTemplate": "golangci/golangci-lint",
256+
"datasourceTemplate": "github-releases",
257+
"versioningTemplate": "semver",
258+
"extractVersionTemplate": "^v(?<version>.*)"
245259
}
246260
],
247261

.github/workflows/propagate-changes.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -183,27 +183,5 @@ jobs:
183183
core.info('Push originated from development (excluded). Skipping propagation back to development.');
184184
}
185185
} else if (currentBranch === 'development') {
186-
// Development -> Feature/Hotfix branches (The Pittsburgh Model)
187-
// We propagate changes from dev DOWN to features/hotfixes so they stay up to date.
188-
189-
const branches = await github.paginate(github.rest.repos.listBranches, {
190-
owner: context.repo.owner,
191-
repo: context.repo.repo,
192-
});
193-
194-
// Filter for feature/* and hotfix/* branches using regex
195-
// AND exclude the branch that just got merged in (if any)
196-
const targetBranches = branches
197-
.map(b => b.name)
198-
.filter(name => {
199-
const isTargetType = /^feature\/|^hotfix\//.test(name);
200-
const isExcluded = (name === excludedBranch);
201-
return isTargetType && !isExcluded;
202-
});
203-
204-
core.info(`Found ${targetBranches.length} target branches (excluding '${excludedBranch || 'none'}'): ${targetBranches.join(', ')}`);
205-
206-
for (const targetBranch of targetBranches) {
207-
await createPR('development', targetBranch);
208-
}
186+
core.info('Push to development detected. No downstream propagation configured.');
209187
}

0 commit comments

Comments
 (0)