Skip to content

Commit ebbec17

Browse files
authored
Merge pull request #124 from CompPhy/main
Merge main to release-42
2 parents bcbb94b + 5227ad3 commit ebbec17

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

.github/workflows/main-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Clone the repository
51-
uses: actions/checkout@v5
51+
uses: actions/checkout@v6
5252

5353
# Based on https://github.com/orgs/community/discussions/25678
5454
- name: Delete huge unnecessary tools folder

.github/workflows/pr-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Clone the repository
26-
uses: actions/checkout@v5
26+
uses: actions/checkout@v6
2727

2828
# Based on https://github.com/orgs/community/discussions/25678
2929
- name: Delete huge unnecessary tools folder

renovate.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
"github>platform-engineering-org/.github",
55
"schedule:daily"
66
],
7-
"baseBranches": ["main", "release-42"],
7+
"baseBranchPatterns": [
8+
"main",
9+
"release-42"
10+
],
811
"ignorePresets": [
912
"group:all"
1013
],
@@ -19,13 +22,6 @@
1922
],
2023
"groupName": "{{depName}} Docker updates"
2124
}
22-
,
23-
{
24-
"description": "Disable major version updates on release-42",
25-
"matchUpdateTypes": ["major"],
26-
"matchBaseBranches": ["release-42"],
27-
"enabled": false
28-
}
2925
],
3026
"separateMultipleMajor": true,
3127
"pruneStaleBranches": false,

0 commit comments

Comments
 (0)