Skip to content

Commit 56b9953

Browse files
MaitreyaBuddhaSayaan Saha
authored andcommitted
Auto build branches and PRs (#229)
1 parent fa0c93d commit 56b9953

File tree

4 files changed

+6
-26
lines changed

4 files changed

+6
-26
lines changed

.circleci/config.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ shell:
2424
${DOCKER_RUN} bash
2525

2626
build-image:
27-
docker build -t ${SDK_BUILD_IMAGE} .
27+
docker build -t ${SDK_BUILD_IMAGE} . -f jenkins/build.dockerfile
2828
docker push ${SDK_BUILD_IMAGE}
2929

3030
.PHONY: build

jenkins/pipeline.groovy renamed to jenkins/Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ pipeline {
1818
}
1919

2020
def buildAndTest() {
21-
withDockerContainer(args: "", image: "leanplum/android-sdk-build") {
21+
def buildImage = docker.build("leanplum/android-sdk-build", "-f ./jenkins/build.dockerfile .")
22+
buildImage.inside {
2223
sh 'make sdk'
2324
}
2425
}

Dockerfile renamed to jenkins/build.dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ ARG platform_image="platforms;${emulator_platform}"
77
RUN apt-get update && \
88
apt-get install -y --no-install-recommends \
99
nodejs=6.11.4~dfsg-1ubuntu1 \
10+
npm \
1011
build-essential \
1112
&& rm -rf /var/lib/apt/lists/*
1213

1314
ENV PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin"
1415

16+
RUN npm install -g yarn
17+
1518
RUN sdkmanager emulator tools platform-tools ${platform_image} ${system_image} --verbose && \
1619
echo no | avdmanager create avd -n "device1" --package ${system_image} --tag google_apis

0 commit comments

Comments
 (0)