Skip to content

Commit c2b1921

Browse files
committed
trying to setup gradle tests workflow
1 parent cad723f commit c2b1921

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

.github/workflows/pull_request.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
name: pull_request
22

33
on:
4-
pull_request:
5-
types: [opened, reopened, synchronize]
4+
pull_request:
5+
types: [ opened, reopened, synchronize ]
66

77
jobs:
8-
tests:
9-
name: tests
10-
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
11-
with:
12-
exclude_swift_versions: "[{\"swift_version\": \"5.8\"}, {\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
13-
pre_build_command: "apt-get update -y -q && apt-get install -y -q openjdk-21-jdk make"
14-
build_command: "make"
15-
env_vars: |
16-
JAVA_HOME="/usr/lib/jvm/java-21-openjdk-amd64"
8+
test-java:
9+
name: test-java
10+
uses: actions/setup-java@v4
11+
with:
12+
distribution: 'zulu'
13+
java-version: '22'
14+
cache: 'gradle'
15+
run: ./gradlew build --no-daemon
16+
test-swift:
17+
name: test-swift
18+
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
19+
with:
20+
exclude_swift_versions: "[{\"swift_version\": \"5.8\"}, {\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
21+
pre_build_command: "./scripts/install_jdk.sh"
22+
build_command: "make"
23+
env_vars: |
24+
JAVA_HOME="/usr/lib/jvm/java-21-openjdk-amd64"

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN if [ "$JDK_SHA" != "$EXPECT_JDK_SHA" ]; then \
3636
echo "JDK SHA is correct."; \
3737
fi
3838
# Extract and verify the JDK installation
39-
RUN tar xzvf jdk.tar.gz && rm jdk.tar.gz && mv jdk-23 jdk
40-
RUN /jdk/bin/java -version
41-
ENV JAVA_HOME="/jdk"
42-
ENV PATH="$PATH:/jdk/bin"
39+
RUN tar xzvf jdk.tar.gz && rm jdk.tar.gz && mkdir -p /usr/lib/jvm; mv jdk-23 /usr/lib/jvm/openjdk-23
40+
ENV JAVA_HOME="/usr/lib/jvm/openjdk-23"
41+
ENV PATH="$PATH:/usr/lib/jvm/openjdk-23/bin"
42+
RUN /usr/lib/jvm/openjdk-23/bin/java -version

0 commit comments

Comments
 (0)