Skip to content

Commit f65aaba

Browse files
committed
update build.xml and test script
1 parent 6b2b2a4 commit f65aaba

2 files changed

Lines changed: 10 additions & 18 deletions

File tree

.github/workflows/test.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,23 @@ jobs:
1515
uses: actions/setup-java@v4
1616
with:
1717
distribution: 'zulu'
18-
java-version: '17'
18+
java-version: '25'
1919
java-package: jdk+fx
2020

21-
- name: Checkout beast2
21+
- name: Checkout beast3
2222
uses: actions/checkout@v4
2323
with:
24-
repository: CompEvol/beast2
25-
path: beast2
26-
27-
- name: Checkout BeastFX
28-
uses: actions/checkout@v4
29-
with:
30-
repository: CompEvol/BeastFX
31-
path: BeastFX
24+
repository: CompEvol/beast3
25+
path: beast3
3226

3327
- name: Find build.xml
3428
run: |
3529
pwd
3630
find . -name "build.xml"
3731
38-
- name: Build beast2
39-
run: ant -noinput -buildfile ./beast2/build.xml compile-all
32+
- name: Build beast3
33+
run: ant -noinput -buildfile ./beast3/build.xml compile-all
4034

41-
- name: Build BeastFX
42-
run: ant -noinput -buildfile ./BeastFX/build.xml compile-allBeastFX
4335

4436
- name: Run BEASTlbs Ant
4537
run: ant -noinput -buildfile ./BEASTLabs/build.xml junitBEASTlabs

build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<property name="liblabs" location="../BEASTLabs/lib" />
1414
<property name="release_dir" value="release" />
1515
<property name="distlabs" location="${buildlabs}/dist" />
16-
<property name="beast2path" location="../beast2" />
16+
<property name="beast2path" location="../beast3" />
1717
<property name="BeastFXpath" location="../BeastFX" />
1818
<property name="srcBeast2" location="${beast2path}/test" />
1919
<property name="beast2classpath" location="${beast2path}/build" />
2020
<property name="Add_on_dir" value="${release_dir}/add-on" />
2121

22-
<!-- BEAST 2 currently uses Java 17 -->
23-
<property name="sourceVersion" value="17"/>
24-
<property name="targetVersion" value="17"/>
22+
<!-- BEAST 2 currently uses Java 25 -->
23+
<property name="sourceVersion" value="25"/>
24+
<property name="targetVersion" value="25"/>
2525

2626

2727
<property name="version" value="1.9.7" />

0 commit comments

Comments
 (0)