Skip to content

Commit

Permalink
Update docker integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Rawi01 committed Oct 8, 2024
1 parent b8c0427 commit ec87cfb
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 24 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,12 @@ jobs:
needs: build
strategy:
matrix:
jdk: [8, 11, 17, 21, 22]
jdk: [8, 11, 17, 21, 23]
tool:
- {name: "maven", cmd: "mvn compile"}
- {name: "gradle", cmd: "gradle assemble"}
- {name: "ant", cmd: "ant dist"}
- {name: "bazel", cmd: "bazel build //:ProjectRunner"}
exclude:
- {tool: {name: "gradle", cmd: "gradle assemble"}, jdk: 22}
fail-fast: false
env:
IMAGE_NAME: lombok-${{ matrix.tool.name }}-jdk${{ matrix.jdk }}
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions docker/gradle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ RUN provision/jdk/java-${jdk}.sh
ARG lombokjar=lombok.jar
ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar

ARG gradle=8.5
ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
RUN provision/gradle/gradle-${gradle}.sh
ARG gradle=8.10.2
ADD provision/gradle/gradle.sh provision/gradle/gradle.sh
RUN provision/gradle/gradle.sh ${gradle}

FROM ubuntu:22.04

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions docker/provision/gradle/gradle-6.8.3.sh

This file was deleted.

4 changes: 0 additions & 4 deletions docker/provision/gradle/gradle-7.6.1.sh

This file was deleted.

4 changes: 0 additions & 4 deletions docker/provision/gradle/gradle-8.3.sh

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apt-get update && apt-get install -y wget unzip
wget https://github.com/gradle/gradle-distributions/releases/download/v8.5.0/gradle-8.5-bin.zip -O gradle.zip
wget https://github.com/gradle/gradle-distributions/releases/download/v$1/gradle-$1-bin.zip -O gradle.zip
mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
mv /opt/gradle/gradle-8.5 /opt/gradle/gradle
mv /opt/gradle/gradle-$1 /opt/gradle/gradle
4 changes: 0 additions & 4 deletions docker/provision/jdk/java-22.sh

This file was deleted.

4 changes: 4 additions & 0 deletions docker/provision/jdk/java-23.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget
wget https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-23 /opt/jdk

0 comments on commit ec87cfb

Please sign in to comment.