Skip to content

Commit 837b50c

Browse files
author
Lawrence Nahum
committed
add buster py3/java/js release, deprecate all py2 other than x86_64 linux, deprecate stretch java/js
1 parent f78a3a9 commit 837b50c

File tree

4 files changed

+54
-7
lines changed

4 files changed

+54
-7
lines changed

.gitlab-ci.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,23 @@ linux_release:
1212
- cd $CI_PROJECT_DIR
1313
- ./tools/build_python_wheels.sh
1414
- python setup.py sdist --dist-dir ./wally_core
15-
- ./tools/build_android_libraries.sh
16-
- ./tools/build_js_bindings.sh
15+
16+
buster_release:
17+
image: greenaddress/wallycore@sha256:fb775125c186cf2f78ecf8edc71ce59db67ba4b17d658847f95248dda793d176
18+
artifacts:
19+
expire_in: 1 day
20+
name: wallycore-bindings
21+
when: on_success
22+
paths:
23+
- wally_dist/*
24+
tags:
25+
- ga
26+
script:
27+
- cd $CI_PROJECT_DIR
28+
- ./tools/build_python_wheels.sh python3
29+
- python3 setup.py sdist --dist-dir ./wally_core
30+
- PYTHON_VERSION=3 ./tools/build_android_libraries.sh
31+
- PYTHON_VERSION=3 ./tools/build_js_bindings.sh
1732
- mv release wallycore-android-jni
1833
- tar cvf wally_dist/wallycore-android-jni.tar wallycore-android-jni
1934
- gzip -9 wally_dist/wallycore-android-jni.tar
@@ -76,7 +91,7 @@ osx_release:
7691
- wally_dist/*
7792
script:
7893
- cd $CI_PROJECT_DIR
79-
- ./tools/build_python_wheels.sh "python python3"
94+
- ./tools/build_python_wheels.sh python3
8095

8196
armv7l_release:
8297
tags:
@@ -89,7 +104,7 @@ armv7l_release:
89104
- wally_dist/*
90105
script:
91106
- cd $CI_PROJECT_DIR
92-
- ./tools/build_python_wheels.sh
107+
- ./tools/build_python_wheels.sh python3
93108

94109
arm64_release:
95110
tags:
@@ -102,7 +117,7 @@ arm64_release:
102117
- wally_dist/*
103118
script:
104119
- cd $CI_PROJECT_DIR
105-
- ./tools/build_python_wheels.sh
120+
- ./tools/build_python_wheels.sh python3
106121

107122
powerpcg4_release:
108123
tags:
@@ -121,7 +136,7 @@ freebsdamd64_release:
121136
- wally_dist/*
122137
script:
123138
- cd $CI_PROJECT_DIR
124-
- ./tools/build_python_wheels.sh
139+
- ./tools/build_python_wheels.sh python3
125140

126141
windows10_release:
127142
tags:
@@ -169,6 +184,7 @@ package_release:
169184
script: cd $CI_PROJECT_DIR/wally_dist && /opt/process_release
170185
dependencies:
171186
- linux_release
187+
- buster_release
172188
- ubuntu_18.04_release
173189
- ubuntu_19.04_release
174190
- osx_release

contrib/Dockerfile_buster

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM debian:buster@sha256:903779f30a7ee46937bfb21406f125d5fdace4178074e1cc71c49039ebf7f48f
2+
COPY buster_deps.sh /deps.sh
3+
RUN /deps.sh && rm /deps.sh
4+
VOLUME /wallycore
5+
ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
6+
ENV ANDROID_NDK=/opt/android-ndk-r20

contrib/buster_deps.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#! /usr/bin/env bash
2+
set -e
3+
4+
export NDK_FILENAME=android-ndk-r20-linux-x86_64.zip
5+
6+
dpkg --add-architecture i386
7+
8+
apt-get update -qq
9+
apt-get upgrade -yqq
10+
apt-get install python python3-distutils-extra python3-dev build-essential libffi-dev swig autoconf libtool pkg-config lib32z1 openjdk-11-jdk ca-certificates-java unzip curl libc6:i386 libc6-dev:i386 libncurses5:i386 libstdc++6:i386 lib32z1 virtualenv python3-setuptools apt-transport-https -yqq
11+
update-java-alternatives -s java-1.11.0-openjdk-amd64
12+
13+
curl -sL https://deb.nodesource.com/setup_8.x | bash -
14+
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
15+
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
16+
apt-get -yqq update
17+
apt-get -yqq upgrade
18+
apt-get -yqq install nodejs yarn
19+
20+
cd /opt && curl -sSO https://dl.google.com/android/repository/${NDK_FILENAME} && unzip -qq ${NDK_FILENAME} && rm ${NDK_FILENAME}
21+
22+
apt-get remove --purge curl -yqq
23+
apt-get -yqq autoremove
24+
apt-get -yqq clean
25+
rm -rf /var/lib/apt/lists/* /var/cache/* /tmp/* /usr/share/locale/* /usr/share/man /usr/share/doc /lib/xtables/libip6*

tools/build_android_libraries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ for arch in $ARCH_LIST; do
3838
fi
3939

4040
# What we want built
41-
useropts="--enable-swig-java --enable-elements --enable-ecmult-static-precomputation"
41+
useropts="--enable-swig-java --disable-swig-python --enable-elements --enable-ecmult-static-precomputation"
4242

4343
# Configure and build with the above options
4444
android_build_wally $arch $toolsdir $api $useropts

0 commit comments

Comments
 (0)