Skip to content

Commit c1cbe82

Browse files
authored
Merge pull request #26 from hendriks73/hendrik/update_ci_and_metadata
update ci and metadata
2 parents 53f2f8b + 04a844a commit c1cbe82

3 files changed

Lines changed: 120 additions & 105 deletions

File tree

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

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@ on:
1313

1414
jobs:
1515

16-
1716
macos-build:
1817

1918
runs-on: ${{ matrix.os }}
2019
strategy:
2120
matrix:
2221
jarch: [ aarch64, x86_64 ]
23-
os: [ macos-12, macos-latest ]
24-
java: [ '8', '9', '11', '15', '17', '20' ]
22+
os: [ macos-15, macos-latest ]
23+
java: [ '8', '11', '15', '17', '20', '25' ]
2524

2625
steps:
2726
- name: Set up Doxygen
2827
run: brew install doxygen
2928

30-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v6
3130
- name: Set up Java
32-
uses: actions/setup-java@v2
31+
uses: actions/setup-java@v5
3332
with:
3433
java-version: ${{ matrix.java }}
3534
architecture: x64
@@ -48,35 +47,46 @@ jobs:
4847
uses: codecov/codecov-action@v2
4948
with:
5049
token: ${{ secrets.CODECOV_TOKEN }}
51-
if: matrix.os == 'macos-12' && matrix.java == '9' && matrix.jarch == 'x86_64'
50+
if: matrix.os == 'macos-15' && matrix.java == '9' && matrix.jarch == 'x86_64'
5251

5352
- name: Build tagtraum site
5453
run: |
5554
mvn --no-transfer-progress \
5655
--batch-mode \
57-
--activate-profiles ffsampledsp-x86_64-macos \
56+
--activate-profiles ffsampledsp-aarch64-macos \
5857
--file pom.xml \
5958
clean install site:site
60-
if: matrix.os == 'macos-12' && matrix.java == '9' && matrix.jarch == 'x86_64'
59+
if: matrix.os == 'macos-15' && matrix.java == '9' && matrix.jarch == 'x86_64'
6160

6261

6362
windows-build:
6463

65-
runs-on: windows-2019
64+
runs-on: windows-latest
6665
strategy:
6766
matrix:
6867
arch: [x64, x86]
69-
java: [ '8', '9', '11', '15', '17' ]
68+
java: ['8', '11', '15', '17', '25']
69+
7070
include:
7171
- arch: x64
7272
jarch: x86_64
7373
sys: mingw64
7474
env: x86_64
75+
7576
- arch: x86
7677
jarch: i386
7778
sys: mingw32
7879
env: i686
7980

81+
exclude:
82+
# ❌ 32-bit Windows + modern Java is not supported
83+
- arch: x86
84+
java: '15'
85+
- arch: x86
86+
java: '17'
87+
- arch: x86
88+
java: '25'
89+
8090
defaults:
8191
run:
8292
shell: msys2 {0}
@@ -87,14 +97,14 @@ jobs:
8797
install: mingw-w64-${{ matrix.env }}-toolchain
8898
path-type: inherit
8999

90-
- uses: actions/checkout@v2
100+
- uses: actions/checkout@v6
91101

92102
- name: Set up Doxygen
93103
run: |
94104
pacman --noconfirm -S mingw-w64-${{ matrix.env}}-doxygen
95105
96106
- name: Set up Java
97-
uses: actions/setup-java@v2
107+
uses: actions/setup-java@v5
98108
with:
99109
java-version: ${{ matrix.java }}
100110
architecture: ${{ matrix.arch }}
@@ -121,8 +131,8 @@ jobs:
121131
runs-on: ${{ matrix.os }}
122132
strategy:
123133
matrix:
124-
os: [ ubuntu-20.04, ubuntu-latest ]
125-
java: [ '8', '9', '11', '15', '17', '20' ]
134+
os: [ ubuntu-22.04, ubuntu-latest ]
135+
java: [ '8', '11', '15', '17', '20', '25' ]
126136
arch: [ x64, aarch64 ]
127137
include:
128138
- arch: x64
@@ -138,12 +148,12 @@ jobs:
138148
sudo apt-get update
139149
sudo apt-get install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu crossbuild-essential-arm64
140150
141-
- name: Set up Doxygen
142-
run: sudo apt-get install -y doxygen
143-
144-
- uses: actions/checkout@v2
151+
- name: Set up Doxygen and native build dependencies
152+
run: sudo apt-get install -y doxygen libbz2-dev zlib1g-dev
153+
154+
- uses: actions/checkout@v6
145155
- name: Set up Java
146-
uses: actions/setup-java@v2
156+
uses: actions/setup-java@v5
147157
with:
148158
java-version: ${{ matrix.java }}
149159
distribution: 'zulu'

0 commit comments

Comments
 (0)