Skip to content

Commit 95e10e8

Browse files
authored
Switch to resusable preset (#513)
1 parent 949fa53 commit 95e10e8

File tree

2 files changed

+7
-52
lines changed

2 files changed

+7
-52
lines changed

.github/renovate.json5

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,67 +7,22 @@
77
{
88
"matchPackageNames": ["pydantic"],
99
"allowedVersions": "<2.0.0"
10-
}, {
11-
"matchPackageNames": ["python"],
12-
"allowedVersions": "<3.11"
1310
},
1411
{
15-
"matchDepNames": ["Juju 2"],
16-
"matchPackageNames": ["juju/juju"],
17-
"allowedVersions": "<3.0.0",
18-
"extractVersion": "^v(?<version>.*)$",
19-
"groupName": "Juju 2"
20-
},
21-
{
22-
"matchDepNames": ["Juju 3"],
23-
"matchPackageNames": ["juju/juju"],
24-
"allowedVersions": "<3.2.0",
25-
"extractVersion": "^v(?<version>.*)$",
26-
"groupName": "Juju 3"
27-
},
28-
{
29-
"matchDepNames": ["libjuju 2"],
30-
"matchPackageNames": ["juju"],
3112
"matchManagers": ["regex"],
13+
"matchDepNames": ["juju"],
3214
"matchDatasources": ["pypi"],
33-
"versioning": "loose",
3415
"allowedVersions": "<3",
35-
"groupName": "Juju 2"
16+
"groupName": "Juju agents"
3617
}
3718
],
3819
"regexManagers": [
3920
{
40-
"customType": "regex",
41-
"fileMatch": ["^(workflow-templates|\\.github/workflows)/[^/]+\\.ya?ml$"],
42-
"matchStrings": [
43-
"(- agent: )(?<currentValue>.*?) +# renovate: latest juju 2"
44-
],
45-
"depNameTemplate": "Juju 2",
46-
"packageNameTemplate": "juju/juju",
47-
"datasourceTemplate": "github-releases",
48-
"versioningTemplate": "loose",
49-
"extractVersionTemplate": "Juju release"
50-
},
51-
{
52-
"customType": "regex",
53-
"fileMatch": ["^(workflow-templates|\\.github/workflows)/[^/]+\\.ya?ml$"],
54-
"matchStrings": [
55-
"(- agent: )(?<currentValue>.*?) +# renovate: latest juju 3"
56-
],
57-
"depNameTemplate": "Juju 3",
58-
"packageNameTemplate": "juju/juju",
59-
"datasourceTemplate": "github-releases",
60-
"versioningTemplate": "loose",
61-
"extractVersionTemplate": "Juju release"
62-
},
63-
{
64-
"customType": "regex",
65-
"fileMatch": ["^(workflow-templates|\\.github/workflows)/[^/]+\\.ya?ml$"],
21+
"fileMatch": ["^\\.github/workflows/[^/]+\\.ya?ml$"],
6622
"matchStrings": [
6723
"(libjuju: )==(?<currentValue>.*?) +# renovate: latest libjuju 2"
6824
],
69-
"depNameTemplate": "libjuju 2",
70-
"packageNameTemplate": "juju",
25+
"depNameTemplate": "juju",
7126
"datasourceTemplate": "pypi",
7227
"versioningTemplate": "loose"
7328
}

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ jobs:
5353
fail-fast: false
5454
matrix:
5555
juju:
56-
- agent: 2.9.49 # renovate: latest juju 2
56+
- agent: 2.9.49 # renovate: juju-agent-pin-minor
5757
libjuju: ==2.9.49.0 # renovate: latest libjuju 2
5858
allure_on_amd64: false
59-
- agent: 3.1.8 # renovate: latest juju 3
59+
- agent: 3.1.8 # renovate: juju-agent-pin-minor
6060
allure_on_amd64: true
6161
architecture:
6262
- amd64
6363
include:
6464
- juju:
65-
agent: 3.1.8 # renovate: latest juju 3
65+
agent: 3.1.8 # renovate: juju-agent-pin-minor
6666
allure_on_amd64: true
6767
architecture: arm64
6868
name: Integration test charm | ${{ matrix.juju.agent }} | ${{ matrix.architecture }}

0 commit comments

Comments
 (0)