Skip to content

Commit abd9d9e

Browse files
Merge feature/github-actions into develop
2 parents 21ba942 + d5261f7 commit abd9d9e

File tree

5 files changed

+27
-48
lines changed

5 files changed

+27
-48
lines changed

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

Lines changed: 5 additions & 6 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,7 +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/run_python_unit_tests.sh
5451
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.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'

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
<apache.commons.lang.version>3.19.0</apache.commons.lang.version>
7575
<apache.commons.text.version>1.11.0</apache.commons.text.version>
76-
<commons-io.version>2.20.0</commons-io.version>
76+
<commons-io.version>2.21.0</commons-io.version>
7777
<guava.version>33.3.1-jre</guava.version>
7878

7979
<!-- Release -->
@@ -87,7 +87,7 @@
8787
<guice.version>6.0.0</guice.version>
8888

8989
<slf4j.version>2.0.17</slf4j.version>
90-
<logback.version>1.5.20</logback.version>
90+
<logback.version>1.5.21</logback.version>
9191

9292
<!-- test -->
9393
<junit.version>6.0.1</junit.version>

0 commit comments

Comments
 (0)