Skip to content

chore(ci): stop hardcoding stable-branch #2605

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

Draft
renner0e wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(ci): stop hardcoding stable-branch #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"config:best-practices"
],

"baseBranchPatterns": ["main", "stable-f44"],
"baseBranchPatterns": ["main", "/^stable-f[0-9][0-9]$/"],

// Do not rebase when the default branch is updated
"rebaseWhen": "never",
Expand Down Expand Up @@ -59,7 +59,7 @@
],
// Brew and common are not "security updates", they have to go through :testing/main first
// to reach a stable release
"matchBaseBranches": ["stable-f44"],
"matchBaseBranches": ["/^stable-f[0-9][0-9]$/"],
"enabled": false
},
{
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-image-latest-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: Latest Images
on:
push:
branches:
- stable-f44
- 'stable-f[0-9][0-9]'
paths-ignore:
- "**.md"
- ".github/workflows/moderator.yml"
- ".github/workflows/scorecard.yml"
merge_group:
branches:
- stable-f44
- 'stable-f[0-9][0-9]'
pull_request:
branches:
- stable-f44
- 'stable-f[0-9][0-9]'
paths-ignore:
- "**.md"
- ".github/workflows/moderator.yml"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-image-stable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
# We still want to know if things are broken
pull_request:
branches:
- stable-f44
- 'stable-f[0-9][0-9]'
paths-ignore:
- "**.md"
- ".github/workflows/moderator.yml"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cherry-pick-to-stable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
with:
# Use the dynamically generated GitHub App token here too
github_token: ${{ steps.generate-token.outputs.token }}
target_branches: "stable-f44"
target_branches: ${{ vars.STABLE_BRANCH }}
add_labels: "backported-to-stable"
pull_title: '${pull_title} [Backport ${target_branch}]'
pull_description: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with:
persist-credentials: false
fetch-depth: 500
ref: stable-f44
ref: ${{ vars.STABLE_BRANCH }}

- name: Install Just
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-schedule-stable-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Trigger Stable Image Build
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: stable-f44
BRANCH: ${{ vars.STABLE_BRANCH }}
run: |
gh workflow run \
build-image-stable.yml \
Expand Down
Loading