Skip to content

Commit

Permalink
Merge pull request trustyai-explainability#398 from red-hat-data-serv…
Browse files Browse the repository at this point in the history
…ices/fix-deleted-files

Fix deleted files
  • Loading branch information
ckhordiasma authored Feb 18, 2025
2 parents 5d7d0b4 + 2aaac41 commit 6a972d2
Show file tree
Hide file tree
Showing 6 changed files with 1,359 additions and 1 deletion.
73 changes: 73 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"branchPrefix": "renovate/",
"baseBranches": ["main", "rhoai-2.16"],
"enabledManagers": ["dockerfile", "tekton"],
"dockerfile": {
"schedule": ["at any time"],
"enabled": true,
"additionalBranchPrefix": "{{baseBranch}}/",
"branchPrefix": "konflux/mintmaker/",
"packageRules": [
{
"matchUpdateTypes": ["major", "minor", "pin", "pinDigest", "patch", "bump"],
"enabled": false
},
{
"matchUpdateTypes": ["digest"],
"matchFileNames": ["*Dockerfile.konflux*"],
"enabled": true
}
]
},
"tekton": {
"fileMatch": [
"\\.yaml$",
"\\.yml$"
],
"includePaths": [
".tekton/**"
],
"ignoreTests": true,
"automergeType": "pr",
"automerge": true,
"packageRules": [
{
"matchUpdateTypes": ["major", "minor", "pin", "pinDigest", "patch", "bump"],
"enabled": false
},
{
"matchPackagePatterns": [
"^quay.io/redhat-appstudio-tekton-catalog/",
"^quay.io/konflux-ci/tekton-catalog/"
],
"matchUpdateTypes": ["digest"],
"enabled": false,
"groupName": "Konflux references",
"branchPrefix": "konflux/references/",
"group": {
"branchTopic": "{{{baseBranch}}}",
"commitMessageTopic": "{{{groupName}}}"
},
"commitMessageTopic": "Konflux references",
"semanticCommits": "enabled",
"prFooter": "To execute skipped test pipelines write comment `/ok-to-test`",
"prBodyColumns": [
"Package",
"Change",
"Notes"
],
"prBodyDefinitions": {
"Notes": "{{#if (or (containsString updateType 'minor') (containsString updateType 'major'))}}:warning:[migration](https://github.com/redhat-appstudio/build-definitions/blob/main/task/{{{replace '^quay.io/(redhat-appstudio-tekton-catalog|konflux-ci/tekton-catalog)/task-' '' packageName}}}/{{{newVersion}}}/MIGRATION.md):warning:{{/if}}"
},
"prBodyTemplate": "{{{header}}}{{{table}}}{{{notes}}}{{{changelogs}}}{{{controls}}}{{{footer}}}",
"recreateWhen": "always",
"rebaseWhen": "behind-base-branch"
}
]
},
"prHourlyLimit": 0
}
26 changes: 26 additions & 0 deletions .github/workflows/instant-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Instant Merge Konflux PRs

on:
pull_request:
types:
- opened
paths:
- config/overlays/rhoai/params.env

permissions:
contents: write
pull-requests: write
checks: write
security-events: write
statuses: write

jobs:
instant-merge:
runs-on: ubuntu-latest
steps:
- name: instant-merge
if: ${{ github.event.sender.login == 'red-hat-konflux[bot]' && ( contains(github.event.pull_request.title, 'update ta-lmes-') || contains(github.event.pull_request.title, 'update fms-guardrails-orchestrator-') ) }}
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}
Loading

0 comments on commit 6a972d2

Please sign in to comment.