Skip to content

Commit 9ef0a9a

Browse files
Merge branch 'develop' into chore/cleanup_code
2 parents 5454ec9 + abd9d9e commit 9ef0a9a

36 files changed

+690
-576
lines changed

.github/renovate.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,28 @@
5151
"!com.regnosys.rosetta:com.regnosys.rosetta",
5252
"!rosetta.dsl.version"
5353
]
54+
},
55+
{
56+
"description": "Always open PRs immediately and prioritize Renovate GitHub Action updates",
57+
"matchManagers": ["github-actions"],
58+
"matchPackageNames": ["renovatebot/github-action"],
59+
"prCreation": "immediate",
60+
"prPriority": 100,
61+
"stabilityDays": 0,
62+
"minimumReleaseAge": "0 days",
63+
"schedule": ["at any time"]
64+
},
65+
{
66+
"description": "Automerge safe GitHub Actions patch updates",
67+
"matchManagers": ["github-actions"],
68+
"matchUpdateTypes": ["patch"],
69+
"automerge": true,
70+
"automergeType": "pr"
71+
},
72+
{
73+
"description": "Require dashboard approval for major updates",
74+
"matchUpdateTypes": ["major"],
75+
"dependencyDashboardApproval": true
5476
}
5577
]
5678
}

.github/workflows/build-and-test.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ on:
1414
type: string
1515
default: '3.11'
1616

17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.ref }}
19-
cancel-in-progress: true
17+
2018

2119
jobs:
2220
build-and-test:
@@ -39,6 +37,8 @@ jobs:
3937
- name: Build & Test (Java)
4038
run: mvn -B clean verify
4139

40+
41+
4242
# Python
4343
- name: Set up Python
4444
uses: actions/setup-python@v6
@@ -48,8 +48,6 @@ jobs:
4848

4949
- name: Run Python Unit Tests
5050
run: |
51-
chmod +x test/python_setup/setup_python_env.sh
52-
chmod +x test/python_setup/cleanup_python_env.sh
53-
chmod +x test/python_unit_tests/setup_unit_test_env.sh
54-
chmod +x test/python_unit_tests/run_python_unit_tests.sh
5551
test/python_unit_tests/run_python_unit_tests.sh
52+
53+

.github/workflows/ci-develop.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ci-main.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ci-renovate.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# .github/workflows/ci-renovate.yml
2+
3+
name: CI - Renovate Branches
4+
on:
5+
push:
6+
branches:
7+
- 'renovate/**' # adjust if you changed Renovate's branchPrefix
8+
concurrency:
9+
group: ci-renovate-${{ github.ref }}
10+
cancel-in-progress: true
11+
jobs:
12+
build-and-test:
13+
uses: ./.github/workflows/build-and-test.yml
14+
with:
15+
java-version: '21'
16+
python-version: '3.11'

.github/workflows/ci.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- '**'
7+
pull_request:
8+
9+
concurrency:
10+
# This ensures runs are grouped by PR or by branch
11+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
build-and-test:
16+
# Use the relative path to your reusable workflow
17+
uses: ./.github/workflows/build-and-test.yml
18+
with:
19+
java-version: '21'
20+
python-version: '3.11'

0 commit comments

Comments
 (0)