From bd3b55264a28b5e0a259e573e006f006c6fff93f Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Tue, 16 Jun 2020 12:30:06 -0400 Subject: [PATCH 1/3] Added tekton task for ciBuild run --- ci/docker/Dockerfile | 42 ++++++++++++++++++++++++ ci/tekton/zcash-android-sdk-cibundle.yml | 34 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 ci/docker/Dockerfile create mode 100644 ci/tekton/zcash-android-sdk-cibundle.yml diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile new file mode 100644 index 00000000..ac39843f --- /dev/null +++ b/ci/docker/Dockerfile @@ -0,0 +1,42 @@ +FROM debian:stretch +RUN apt-get update \ + && apt-get install -y openjdk-8-jdk cmake curl wget git unzip python + +ARG BUILD_USER=builder +ARG BUILD_UID=2001 +ARG ANDROID_COMPILE_SDK=29 +ARG ANDROID_BUILD_TOOLS= +ARG ANDROID_SDK_TOOLS=4333796 +ARG ANDROID_NDK_TOOLS=21.1.6352462 +RUN useradd --home-dir /srv/$BUILD_USER \ + --shell /bin/bash \ + --create-home \ + --uid $BUILD_UID\ + $BUILD_USER +USER $BUILD_USER +WORKDIR /srv/$BUILD_USER + +RUN wget --quiet --output-document=/tmp/sdk-tools-linux.zip https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_TOOLS.zip \ + && unzip /tmp/sdk-tools-linux.zip -d $HOME/.android \ + && mkdir -p $HOME/.android \ + && touch $HOME/.android/repositories.cfg \ + && mkdir $HOME/.android/licenses \ + && echo y | $HOME/.android/tools/bin/sdkmanager "ndk;$ANDROID_NDK_TOOLS" >/dev/null \ + && echo y | $HOME/.android/tools/bin/sdkmanager "platform-tools" "platforms;android-$ANDROID_COMPILE_SDK" >/dev/null \ + && echo y | $HOME/.android/tools/bin/sdkmanager "system-images;android-$ANDROID_COMPILE_SDK;default;x86" >/dev/null + +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y + +ENV ANDROID_HOME=/srv/$BUILD_USER/.android +ENV ANDROID_SDK_ROOT=/srv/$BUILD_USER/.android +ENV PATH=/srv/$BUILD_USER/.cargo/bin/:/srv/$BUILD_USER/.android:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + +ENV RUSTUP_HOME=/srv/$BUILD_USER/.cargo/bin/ +ENV CARGO_HOME=/srv/$BUILD_USER/.cargo + +RUN rustup install stable \ + && rustup default stable \ + && rustup target add armv7-linux-androideabi \ + && rustup target add aarch64-linux-android \ + && rustup target add i686-linux-android \ + && rustup target add x86_64-linux-android diff --git a/ci/tekton/zcash-android-sdk-cibundle.yml b/ci/tekton/zcash-android-sdk-cibundle.yml new file mode 100644 index 00000000..9cf165c7 --- /dev/null +++ b/ci/tekton/zcash-android-sdk-cibundle.yml @@ -0,0 +1,34 @@ +--- +apiVersion: tekton.dev/v1beta1 +kind: TaskRun +metadata: + generateName: zcash-android-sdk-cibundle- +spec: + resources: + inputs: + - name: source + resourceSpec: + type: git + params: + - name: revision + value: master + - name: url + value: https://github.com/zcash/zcash-android-wallet-sdk.git + taskSpec: + resources: + inputs: + - name: source + type: git + steps: + - name: gradlew-cibuild + image: electriccoinco/zcash-android-builder:ben + script: | + cd source + env | sort + pwd + ls -la + ./gradlew ciBuild --stacktrace --console=plain \ + -Duser.home=/tekton/home \ + -Dgradle.user.home=/tekton/home/.gradle + securityContext: + runAsUser: 0 \ No newline at end of file From 5f195f3d34aaff205caf223f4c34b00b1c7d1d83 Mon Sep 17 00:00:00 2001 From: Marshall Gaucher <36639405+mdr0id@users.noreply.github.com> Date: Tue, 16 Jun 2020 11:48:45 -0700 Subject: [PATCH 2/3] Update zcash-android-sdk-cibundle.yml Adding patch for ciLint --- ci/tekton/zcash-android-sdk-cibundle.yml | 31 +++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/ci/tekton/zcash-android-sdk-cibundle.yml b/ci/tekton/zcash-android-sdk-cibundle.yml index 9cf165c7..d5bc0647 100644 --- a/ci/tekton/zcash-android-sdk-cibundle.yml +++ b/ci/tekton/zcash-android-sdk-cibundle.yml @@ -2,8 +2,11 @@ apiVersion: tekton.dev/v1beta1 kind: TaskRun metadata: - generateName: zcash-android-sdk-cibundle- + generateName: zcashd-androidbuild- spec: + workspaces: + - name: venv + emptyDir: {} resources: inputs: - name: source @@ -13,15 +16,18 @@ spec: - name: revision value: master - name: url - value: https://github.com/zcash/zcash-android-wallet-sdk.git - taskSpec: + value: https://github.com/zcash/zcash-android-wallet-sdk + taskSpec: resources: inputs: - name: source type: git + workspaces: + - name: venv + mountPath: /venv steps: - - name: gradlew-cibuild - image: electriccoinco/zcash-android-builder:ben + - name: setup-env + image: electriccoinco/zcash-android-builder:latest script: | cd source env | sort @@ -31,4 +37,17 @@ spec: -Duser.home=/tekton/home \ -Dgradle.user.home=/tekton/home/.gradle securityContext: - runAsUser: 0 \ No newline at end of file + runAsUser: 0 + - name: setup-lint + image: electriccoinco/zcash-android-builder:latest + script: | + cd source + env | sort + pwd + ls -la + ./gradlew ciLint --stacktrace --console=plain \ + -Duser.home=/tekton/home \ + -Dgradle.user.home=/tekton/home/.gradle + securityContext: + runAsUser: 0 + From 7c45d19d9d6f6cb4d2662abcc1c05b612c5434af Mon Sep 17 00:00:00 2001 From: Marshall Gaucher <36639405+mdr0id@users.noreply.github.com> Date: Tue, 16 Jun 2020 11:52:35 -0700 Subject: [PATCH 3/3] Update zcash-android-sdk-cibundle.yml update step names --- ci/tekton/zcash-android-sdk-cibundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tekton/zcash-android-sdk-cibundle.yml b/ci/tekton/zcash-android-sdk-cibundle.yml index d5bc0647..2b0e218f 100644 --- a/ci/tekton/zcash-android-sdk-cibundle.yml +++ b/ci/tekton/zcash-android-sdk-cibundle.yml @@ -26,7 +26,7 @@ spec: - name: venv mountPath: /venv steps: - - name: setup-env + - name: build-aar image: electriccoinco/zcash-android-builder:latest script: | cd source @@ -38,7 +38,7 @@ spec: -Dgradle.user.home=/tekton/home/.gradle securityContext: runAsUser: 0 - - name: setup-lint + - name: lint image: electriccoinco/zcash-android-builder:latest script: | cd source