Skip to content

Commit fcb621b

Browse files
committed
switch stretch py2.7 and debug builds to buster, remove stretch
1 parent b83702d commit fcb621b

File tree

4 files changed

+9
-56
lines changed

4 files changed

+9
-56
lines changed

.gitlab-ci.yml

+8-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
linux_release:
2-
image: greenaddress/wallycore@sha256:90d2cfad068798da2877cf90bec1f2bb62809f6c5b2bdf3be28d7be60a17d470
1+
buster_release:
2+
image: greenaddress/wallycore@sha256:d76dbd6c02de1a20a096dccc3c846dc3121c964852292c6c918eb068838d934c
33
artifacts:
44
expire_in: 1 day
55
name: wallycore-bindings
@@ -12,29 +12,14 @@ linux_release:
1212
- cd $CI_PROJECT_DIR
1313
- ./tools/build_python_wheels.sh
1414
- python setup.py sdist --dist-dir ./wally_core
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
15+
- ./tools/build_android_libraries.sh
16+
- ./tools/build_js_bindings.sh
3217
- mv release wallycore-android-jni
3318
- tar cvf wally_dist/wallycore-android-jni.tar wallycore-android-jni
3419
- gzip -9 wally_dist/wallycore-android-jni.tar
3520

3621
linux_py2_debug:
37-
image: greenaddress/wallycore@sha256:90d2cfad068798da2877cf90bec1f2bb62809f6c5b2bdf3be28d7be60a17d470
22+
image: greenaddress/wallycore@sha256:d76dbd6c02de1a20a096dccc3c846dc3121c964852292c6c918eb068838d934c
3823
tags:
3924
- ga
4025
script:
@@ -44,13 +29,13 @@ linux_py2_debug:
4429
- DEBUG_WALLY=--enable-debug ./tools/build_js_bindings.sh
4530

4631
linux_py3_debug:
47-
image: greenaddress/wallycore@sha256:90d2cfad068798da2877cf90bec1f2bb62809f6c5b2bdf3be28d7be60a17d470
32+
image: greenaddress/wallycore@sha256:d76dbd6c02de1a20a096dccc3c846dc3121c964852292c6c918eb068838d934c
4833
tags:
4934
- ga
5035
script:
5136
- cd $CI_PROJECT_DIR
5237
- ./tools/cleanup.sh && ./tools/autogen.sh
53-
- PYTHON_VERSION=3.5 DEBUG_WALLY=--enable-debug ./tools/travis_build.sh
38+
- PYTHON_VERSION=3.7 DEBUG_WALLY=--enable-debug ./tools/travis_build.sh
5439

5540
ubuntu_18.04_release:
5641
image: greenaddress/wallycore@sha256:059eeaa5c61df5403fd28d6ea556c317d5809f7274e27901d0f09288a316bb53
@@ -152,7 +137,7 @@ windows10_release:
152137
- tools\msvc\wheel.bat
153138

154139
apidocs:
155-
image: greenaddress/wallycore@sha256:90d2cfad068798da2877cf90bec1f2bb62809f6c5b2bdf3be28d7be60a17d470
140+
image: greenaddress/wallycore@sha256:d76dbd6c02de1a20a096dccc3c846dc3121c964852292c6c918eb068838d934c
156141
artifacts:
157142
expire_in: 14 days
158143
name: wallycore-apidocs
@@ -183,7 +168,6 @@ package_release:
183168
when: on_success
184169
script: cd $CI_PROJECT_DIR/wally_dist && /opt/process_release
185170
dependencies:
186-
- linux_release
187171
- buster_release
188172
- ubuntu_18.04_release
189173
- ubuntu_19.04_release

contrib/Dockerfile

-6
This file was deleted.

contrib/buster_deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dpkg --add-architecture i386
77

88
apt-get update -qq
99
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
10+
apt-get install python{,3}-distutils-extra python{,3}-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 python{,3}-setuptools apt-transport-https -yqq
1111
update-java-alternatives -s java-1.11.0-openjdk-amd64
1212

1313
curl -sL https://deb.nodesource.com/setup_8.x | bash -

contrib/stretch_deps.sh

-25
This file was deleted.

0 commit comments

Comments
 (0)