Skip to content

Commit 9d86c88

Browse files
committed
Add Gradle's 'assemble' check to catch the distribution generation issues
Signed-off-by: Andriy Redko <[email protected]>
1 parent 56a19ea commit 9d86c88

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

.github/workflows/precommit.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
1-
name: Gradle Precommit
1+
name: Gradle Precommit and Asssemble
22
on: [pull_request]
33

44
jobs:
55
precommit:
66
runs-on: ${{ matrix.os }}
77
strategy:
88
matrix:
9-
os: [windows-latest, macos-latest] # precommit on ubuntu-latest is run as a part of the gradle-check workflow
9+
os: [ubuntu-latest, windows-latest, macos-latest] # precommit on ubuntu-latest is run as a part of the gradle-check workflow
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- name: Set up JDK 11
13-
uses: actions/setup-java@v2
13+
uses: actions/setup-java@v3
1414
with:
1515
java-version: 11
16-
distribution: adopt
16+
distribution: temurin
17+
cache: gradle
1718
- name: Run Gradle
1819
run: |
1920
./gradlew javadoc precommit --parallel
21+
- name: Setup docker (missing on MacOS)
22+
if: runner.os == 'macos'
23+
run: |
24+
brew install docker
25+
colima start
26+
sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
27+
- uses: actions/checkout@v3
28+
- name: Set up JDK 11
29+
uses: actions/setup-java@v3
30+
with:
31+
java-version: 11
32+
distribution: temurin
33+
cache: gradle
34+
- name: Run Gradle
35+
run: |
36+
./gradlew assemble --parallel

buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ public abstract class DockerSupportService implements BuildService<DockerSupport
6868
// Defines the possible locations of the Docker CLI. These will be searched in order.
6969
private static String[] DOCKER_BINARIES_UNIX = { "/usr/bin/docker", "/usr/local/bin/docker" };
7070

71-
private static String[] DOCKER_BINARIES_WINDOWS = { System.getenv("PROGRAMFILES") + "\\Docker\\Docker\\resources\\bin\\docker.exe" };
71+
private static String[] DOCKER_BINARIES_WINDOWS = {
72+
System.getenv("PROGRAMFILES") + "\\Docker\\Docker\\resources\\bin\\docker.exe",
73+
System.getenv("SystemRoot") + "\\System32\\docker.exe" /* Github Actions */ };
7274

7375
private static String[] DOCKER_BINARIES = Os.isFamily(Os.FAMILY_WINDOWS) ? DOCKER_BINARIES_WINDOWS : DOCKER_BINARIES_UNIX;
7476

0 commit comments

Comments
 (0)