Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/xhr-allow-authorization-header
Browse files Browse the repository at this point in the history
  • Loading branch information
ksclarke authored Sep 11, 2024
2 parents fe5c06e + 3722b07 commit a4d7dc1
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 140 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
java: [jdk11, jdk17, jdk21, jdk22, graalvm]
java: [jdk17, jdk21, jdk22, graalvm]
fail-fast: false
steps:
- name: Check out the repository
uses: actions/checkout@v4
- name: Test in Linux JDK 11
if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk11'
run: docker compose -f docker/Linux-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe
- name: Test in Linux JDK 17 (LTS)
if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk17'
run: docker compose -f docker/Linux-JDK17/compose.yaml up --build --exit-code-from cantaloupe
Expand All @@ -31,9 +28,6 @@ jobs:
- name: Test in Linux GraalVM
if: matrix.os == 'ubuntu-latest' && matrix.java == 'graalvm'
run: docker compose -f docker/Linux-GraalVM20/compose.yaml up --build --exit-code-from cantaloupe
- name: Test in Windows JDK 11
if: matrix.os == 'windows-latest' && matrix.java == 'jdk11'
run: docker compose -f docker/Windows-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe
- name: Test in Windows JDK 17 (LTS)
if: matrix.os == 'windows-latest' && matrix.java == 'jdk17'
run: docker compose -f docker/Windows-JDK17/compose.yaml up --build --exit-code-from cantaloupe
Expand Down
55 changes: 0 additions & 55 deletions docker/Linux-JDK11/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions docker/Linux-JDK11/docker-compose.yml

This file was deleted.

28 changes: 0 additions & 28 deletions docker/Windows-JDK11/Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions docker/Windows-JDK11/Dockerfile-minio

This file was deleted.

19 changes: 0 additions & 19 deletions docker/Windows-JDK11/docker-compose.yml

This file was deleted.

0 comments on commit a4d7dc1

Please sign in to comment.