Compare commits

..

4 Commits

Author SHA1 Message Date
soxx 40430117de Upgrade to Java 17 3 years ago
soxx 891666ec62 Don't fail if there's nothing to do 3 years ago
soxx 263142a279 We're not running interactively 3 years ago
soxx 1d4cf736d3 God knows what happened there 3 years ago
  1. 8
      Dockerfile
  2. 12
      build.sh

@ -1,12 +1,12 @@
FROM gradle FROM gradle:8-jdk17
ENV SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \ ENV SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \
ANDROID_SDK_ROOT="/usr/local/android-sdk" \ ANDROID_SDK_ROOT="/usr/local/android-sdk" \
JAVA_HOME="/usr/lib/jvm/java-1.11.0-openjdk-amd64" \ JAVA_HOME="/opt/java/openjdk/" \
PATH="/usr/local/android-sdk/cmdline-tools/tools/bin/:/usr/lib/jvm/java-1.11.0-openjdk-amd64/bin:$PATH" PATH="/usr/local/android-sdk/cmdline-tools/tools/bin/:/opt/java/openjdk/bin/:$PATH"
RUN apt update \ RUN apt update \
&& apt install -y openjdk-11-jdk curl unzip patchutils && apt install -y curl unzip patchutils cmake ninja-build
RUN mkdir $ANDROID_SDK_ROOT .android \ RUN mkdir $ANDROID_SDK_ROOT .android \
&& cd $ANDROID_SDK_ROOT \ && cd $ANDROID_SDK_ROOT \

@ -8,7 +8,7 @@ RELEASES="$(curl -s https://api.github.com/repos/M66B/FairEmail/releases)"
LATEST_GITHUB_RELEASE=$(echo $RELEASES | jq '[.[] | select(.assets | length > 0)] | first') LATEST_GITHUB_RELEASE=$(echo $RELEASES | jq '[.[] | select(.assets | length > 0)] | first')
if [ "$LATEST_GITHUB_RELEASE" == null ]; then if [ "$LATEST_GITHUB_RELEASE" == null ]; then
echo "No github release available" echo "No github release available"
exit 1 exit 0
fi fi
VERSION=$(echo $LATEST_GITHUB_RELEASE | jq -r '.tag_name') VERSION=$(echo $LATEST_GITHUB_RELEASE | jq -r '.tag_name')
@ -16,11 +16,11 @@ APK_FILENAME=$(echo $LATEST_GITHUB_RELEASE | jq -r '.assets[0].name')
if rsync sillywalk.de:/srv/www/sillywalk.de/root/releases/$APK_FILENAME; then if rsync sillywalk.de:/srv/www/sillywalk.de/root/releases/$APK_FILENAME; then
echo "$APK_FILENAME already released. Aborting." echo "$APK_FILENAME already released. Aborting."
exit 1 exit 0
fi fi
KEYSTORE_FILE=$(cat $ANDROID_KEYSTORE_FILE | base64 -w0) \ KEYSTORE_FILE=$(cat $ANDROID_KEYSTORE_FILE | base64 -w0)
KEYSTORE_PROPERTIES=$(envsubst < templates/keystore.properties | base64 -w0) \ KEYSTORE_PROPERTIES=$(envsubst < templates/keystore.properties | base64 -w0)
mkdir -p apk mkdir -p apk
trap "{ trap "{
@ -28,7 +28,7 @@ trap "{
}" EXIT }" EXIT
docker build -t fairemail-apk-builder . docker build -t fairemail-apk-builder .
docker run --rm -it \ docker run --rm \
-v $(pwd)/patches:/patches:ro \ -v $(pwd)/patches:/patches:ro \
-v $(pwd)/apk:/apk:rw \ -v $(pwd)/apk:/apk:rw \
fairemail-apk-builder $VERSION $KEYSTORE_FILE $KEYSTORE_PROPERTIES fairemail-apk-builder $VERSION $KEYSTORE_FILE $KEYSTORE_PROPERTIES
@ -37,7 +37,7 @@ UPLOADED=$(rsync -i --ignore-existing apk/$APK_FILENAME sillywalk.de:/srv/www/si
if [ -z "$UPLOADED" ]; then if [ -z "$UPLOADED" ]; then
echo "$VERSION already uploaded. Aborting." echo "$VERSION already uploaded. Aborting."
exit 1 exit 0
fi fi
export VERSION export VERSION

Loading…
Cancel
Save