Skip to content

Commit ed6743d

Browse files
committed
Only mvn, no ant and skip javadoc, upgrade testing framework
1 parent 7817d00 commit ed6743d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
jdk: [8, 11]
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-python@v4
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
1717
- name: Build
18-
run: docker build -t bio-formats-build . --build-arg BUILD_IMAGE=openjdk:${{ matrix.jdk }}-slim-bullseye
18+
run: docker build -t bio-formats-build . --build-arg BUILD_IMAGE=openjdk:26-ea-${{ matrix.jdk }}-jdk-slim-bookworm

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ COPY --chown=1000:1000 . /bio-formats-build
1515
USER 1000
1616
WORKDIR /bio-formats-build
1717
RUN git submodule update --init
18+
RUN git submodule foreach -q --recursive 'branch="$(git config -f $toplevel/.gitmodules submodule.$name.branch)"; git switch $branch'
1819

1920
RUN python3 -m venv /bio-formats-build/venv
2021
ENV PATH="/bio-formats-build/venv/bin:$PATH"
@@ -24,7 +25,8 @@ RUN pip install -r ome-model/requirements.txt
2425
RUN mvn clean install -DskipSphinxTests -Dmaven.javadoc.skip=true
2526

2627
WORKDIR /bio-formats-build/bioformats
27-
RUN ant jars tools -Djava.security.manager=allow
28+
29+
# RUN ant jars tools
2830

2931
ENV TZ="Europe/London"
3032

0 commit comments

Comments
 (0)