commit b49e3dee09b267f5432ccf343ec5ee93673cb16e
parent 0172ecf1e855c3335aa915a99961e557c51a7e7e
Author: Iván Ávalos <avalos@disroot.org>
Date: Thu, 2 Feb 2023 00:02:19 -0600
Add publishing to local Maven + Docker cleanup + docker-compose.yml
Diffstat:
5 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/Dockerfile.android b/Dockerfile.android
@@ -1,32 +0,0 @@
-FROM debian:bullseye-slim
-
-ENV LANG=C.UTF-8
-ENV DEBIAN_FRONTEND=noninteractive
-ENV ANDROID_HOME=/opt/android-sdk
-ENV REPO_URL=https://git.taler.net/quickjs-tart.git
-
-WORKDIR /opt/quickjs-build
-
-ADD ./docker-android/prepare.sh ./
-ADD ./docker-android/install.sh ./
-
-RUN ./prepare.sh
-RUN ./install.sh
-
-# Cleanup
-RUN apt-get -y autoremove --purge && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
-
-ADD ./docker-android/build.sh ./
-ADD ./download_wallet_core_js.sh ./
-ADD ./quickjs ./quickjs
-ADD ./subprojects ./subprojects
-ADD ./QuickJS-android ./QuickJS-android
-ADD ./meson.build ./
-ADD ./cross/build-android.sh ./cross/
-ADD ./*.c ./
-ADD ./*.h ./
-ADD ./*.js ./
-
-CMD ./build.sh
diff --git a/docker-android/Dockerfile b/docker-android/Dockerfile
@@ -0,0 +1,31 @@
+FROM debian:bullseye-slim
+
+ENV LANG=C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+ENV ANDROID_HOME=/opt/android-sdk
+
+WORKDIR /opt/quickjs-build
+
+ADD ./docker-android/prepare.sh ./
+ADD ./docker-android/install.sh ./
+
+RUN ./prepare.sh
+RUN ./install.sh
+
+# Cleanup
+RUN apt-get -y autoremove --purge && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/*
+
+ADD ./docker-android/build.sh ./
+ADD ./download_wallet_core_js.sh ./
+ADD ./quickjs ./quickjs
+ADD ./subprojects ./subprojects
+ADD ./QuickJS-android ./QuickJS-android
+ADD ./meson.build ./
+ADD ./cross/build-android.sh ./cross/
+ADD ./*.c ./
+ADD ./*.h ./
+ADD ./*.js ./
+
+CMD ./build.sh
diff --git a/docker-android/build.sh b/docker-android/build.sh
@@ -20,7 +20,7 @@ cd $ANDROID_DIR
# Build or publish .aar library
if [ -z "${MAVEN_PUBLISH+x}" ]; then
- ./gradlew build
+ ./gradlew publishToMavenLocal
else
./gradlew publishAllPublicationsToMavenCentralRepository
./gradlew closeAndReleaseRepository
diff --git a/docker-android/docker-compose.yml b/docker-android/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '3'
+
+services:
+ quickjs:
+ build:
+ context: ..
+ dockerfile: docker-android/Dockerfile
+ env_file: .env
+ volumes:
+ - ../.m2:/root/.m2
diff --git a/docker-android/env.example b/docker-android/env.example
@@ -0,0 +1,8 @@
+# Rename this file to .env
+# Read more: https://vanniktech.github.io/gradle-maven-publish-plugin/central/#secrets
+
+MAVEN_PUBLISH=1 # comment out to disable publishing
+ORG_GRADLE_PROJECT_mavenCentralUsername=
+ORG_GRADLE_PROJECT_mavenCentralPassword=
+ORG_GRADLE_PROJECT_signingInMemoryKey=
+ORG_GRADLE_PROJECT_signingInMemoryKeyPassword=