From 97233d67f3f6b01730749d8a8896fb661edf2124 Mon Sep 17 00:00:00 2001 From: shportix Date: Thu, 2 Nov 2023 14:09:39 +0200 Subject: [PATCH] test --- .buildbot/android/Dockerfile | 123 -------------------------------- .buildbot/android/build.sh | 8 --- .buildbot/kivy/Dockerfile | 18 ----- .buildbot/kivy/build.sh | 7 -- .buildbot/kivy/test.sh | 4 -- .buildbot/snap/Dockerfile | 7 -- .buildbot/snap/build.sh | 7 -- .buildbot/tox-bionic/Dockerfile | 22 ------ .buildbot/tox-bionic/build.sh | 3 - .buildbot/tox-bionic/test.sh | 4 -- .buildbot/tox-focal/Dockerfile | 13 ---- .buildbot/tox-focal/test.sh | 1 - .buildbot/winebuild/Dockerfile | 14 ++++ .buildbot/winebuild/build.sh | 8 +++ 14 files changed, 22 insertions(+), 217 deletions(-) delete mode 100755 .buildbot/android/Dockerfile delete mode 100755 .buildbot/android/build.sh delete mode 100644 .buildbot/kivy/Dockerfile delete mode 100755 .buildbot/kivy/build.sh delete mode 100755 .buildbot/kivy/test.sh delete mode 100644 .buildbot/snap/Dockerfile delete mode 100755 .buildbot/snap/build.sh delete mode 100644 .buildbot/tox-bionic/Dockerfile delete mode 100755 .buildbot/tox-bionic/build.sh delete mode 100755 .buildbot/tox-bionic/test.sh delete mode 100644 .buildbot/tox-focal/Dockerfile delete mode 120000 .buildbot/tox-focal/test.sh create mode 100644 .buildbot/winebuild/Dockerfile create mode 100755 .buildbot/winebuild/build.sh diff --git a/.buildbot/android/Dockerfile b/.buildbot/android/Dockerfile deleted file mode 100755 index 83ea3b66..00000000 --- a/.buildbot/android/Dockerfile +++ /dev/null @@ -1,123 +0,0 @@ - -# A container for buildbot -FROM ubuntu:bionic AS android -# FROM ubuntu:20.04 AS buildbot-bionic - -ENV ANDROID_HOME="/opt/android" - -RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \ - locales && \ - locale-gen en_US.UTF-8 -ENV LANG="en_US.UTF-8" \ - LANGUAGE="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" - -RUN apt -y update -qq \ - && apt -y install -qq --no-install-recommends curl unzip ca-certificates \ - && apt -y autoremove - - -ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" -ENV ANDROID_NDK_VERSION="23b" -ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" - -# get the latest version from https://developer.android.com/ndk/downloads/index.html -ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux.zip" -ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}" -# download and install Android NDK -RUN curl "${ANDROID_NDK_DL_URL}" \ - --output "${ANDROID_NDK_ARCHIVE}" \ - && mkdir --parents "${ANDROID_NDK_HOME_V}" \ - && unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \ - && ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \ - && rm -rf "${ANDROID_NDK_ARCHIVE}" - -ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk" - -# get the latest version from https://developer.android.com/studio/index.html -ENV ANDROID_SDK_TOOLS_VERSION="8092744" -ENV ANDROID_SDK_BUILD_TOOLS_VERSION="30.0.3" -ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip" -ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}" -ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}" - -# download and install Android SDK -RUN curl "${ANDROID_SDK_TOOLS_DL_URL}" \ - --output "${ANDROID_SDK_TOOLS_ARCHIVE}" \ - && mkdir --parents "${ANDROID_SDK_HOME}" \ - && unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \ - && mv "${ANDROID_SDK_HOME}/cmdline-tools" "${ANDROID_SDK_HOME}/tools" \ - && rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}" - -# update Android SDK, install Android API, Build Tools... -RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \ - && echo '### User Sources for Android SDK Manager' \ - > "${ANDROID_SDK_HOME}/.android/repositories.cfg" - -# accept Android licenses (JDK necessary!) -RUN apt -y update -qq \ - && apt -y install -qq --no-install-recommends \ - openjdk-11-jdk-headless \ - && apt -y autoremove -RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null - -# download platforms, API, build tools -RUN ${ANDROID_SDK_MANAGER} "platforms;android-30" > /dev/null && \ - ${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \ - ${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null && \ - chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager" - -# download ANT -ENV APACHE_ANT_VERSION="1.9.4" -ENV APACHE_ANT_ARCHIVE="apache-ant-${APACHE_ANT_VERSION}-bin.tar.gz" -ENV APACHE_ANT_DL_URL="https://archive.apache.org/dist/ant/binaries/${APACHE_ANT_ARCHIVE}" -ENV APACHE_ANT_HOME="${ANDROID_HOME}/apache-ant" -ENV APACHE_ANT_HOME_V="${APACHE_ANT_HOME}-${APACHE_ANT_VERSION}" - -RUN curl "${APACHE_ANT_DL_URL}" \ - --output "${APACHE_ANT_ARCHIVE}" \ - && tar -xf "${APACHE_ANT_ARCHIVE}" -C "${ANDROID_HOME}" \ - && ln -sfn "${APACHE_ANT_HOME_V}" "${APACHE_ANT_HOME}" \ - && rm -rf "${APACHE_ANT_ARCHIVE}" - -# install system/build dependencies -RUN apt -y update -qq \ - && apt -y install -qq --no-install-recommends \ - python3 \ - python3-dev \ - python3-pip \ - python3-setuptools \ - python3-venv \ - wget \ - lbzip2 \ - bzip2 \ - lzma \ - patch \ - sudo \ - software-properties-common \ - git \ - zip \ - unzip \ - build-essential \ - ccache \ - autoconf \ - libtool \ - pkg-config \ - zlib1g-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libtinfo5 \ - cmake \ - libffi-dev \ - libssl-dev \ - automake \ - gettext \ - libltdl-dev \ - libidn11 \ - && apt -y autoremove \ - && apt -y clean - -# INSTALL ANDROID PACKAGES - -RUN pip3 install buildozer==1.4.0 -RUN pip3 install --upgrade cython==0.29.15 \ No newline at end of file diff --git a/.buildbot/android/build.sh b/.buildbot/android/build.sh deleted file mode 100755 index 31fa06b8..00000000 --- a/.buildbot/android/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -export LC_ALL=en_US.UTF-8 -export LANG=en_US.UTF-8 -cd packages/android -buildozer android debug || exit $? -cd ../.. -mkdir -p ../out -mv packages/android/bin/*.apk ../out \ No newline at end of file diff --git a/.buildbot/kivy/Dockerfile b/.buildbot/kivy/Dockerfile deleted file mode 100644 index 10b1e569..00000000 --- a/.buildbot/kivy/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# A container for buildbot -FROM ubuntu:focal AS kivy - -ENV DEBIAN_FRONTEND=noninteractive - -ENV SKIPCACHE=2022-08-29 - -RUN apt-get update - -RUN apt-get install -yq \ - build-essential libcap-dev libssl-dev \ - libmtdev-dev libpq-dev \ - python3-dev python3-pip python3-virtualenv \ - xvfb ffmpeg xclip xsel - -RUN ln -sf /usr/bin/python3 /usr/bin/python - -RUN pip3 install --upgrade setuptools pip diff --git a/.buildbot/kivy/build.sh b/.buildbot/kivy/build.sh deleted file mode 100755 index 87aae8f7..00000000 --- a/.buildbot/kivy/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -pip3 install -r kivy-requirements.txt - -export INSTALL_TESTS=True - -pip3 install . diff --git a/.buildbot/kivy/test.sh b/.buildbot/kivy/test.sh deleted file mode 100755 index 3231f250..00000000 --- a/.buildbot/kivy/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -export INSTALL_TESTS=True - -xvfb-run --server-args="-screen 0, 720x1280x24" python3 tests-kivy.py diff --git a/.buildbot/snap/Dockerfile b/.buildbot/snap/Dockerfile deleted file mode 100644 index 7fde093d..00000000 --- a/.buildbot/snap/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM ubuntu:bionic - -ENV SKIPCACHE=2022-07-17 - -RUN apt-get update - -RUN apt-get install -yq --no-install-suggests --no-install-recommends snapcraft diff --git a/.buildbot/snap/build.sh b/.buildbot/snap/build.sh deleted file mode 100755 index 1375b5f4..00000000 --- a/.buildbot/snap/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -cd packages && snapcraft - -cd .. -mkdir -p ../out -mv packages/pybitmessage*.snap ../out diff --git a/.buildbot/tox-bionic/Dockerfile b/.buildbot/tox-bionic/Dockerfile deleted file mode 100644 index 5cc36b7f..00000000 --- a/.buildbot/tox-bionic/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM ubuntu:bionic - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update - -RUN apt-get install -yq --no-install-suggests --no-install-recommends \ - software-properties-common build-essential libcap-dev libffi-dev \ - libssl-dev python-all-dev python-setuptools \ - python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \ - python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb - -RUN apt-get install -yq sudo - -RUN echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -RUN python3.8 -m pip install setuptools wheel -RUN python3.8 -m pip install --upgrade pip tox virtualenv - -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 diff --git a/.buildbot/tox-bionic/build.sh b/.buildbot/tox-bionic/build.sh deleted file mode 100755 index 87f670ce..00000000 --- a/.buildbot/tox-bionic/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -sudo service tor start diff --git a/.buildbot/tox-bionic/test.sh b/.buildbot/tox-bionic/test.sh deleted file mode 100755 index 8b994fd4..00000000 --- a/.buildbot/tox-bionic/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -tox -e lint-basic # || exit 1 -tox diff --git a/.buildbot/tox-focal/Dockerfile b/.buildbot/tox-focal/Dockerfile deleted file mode 100644 index 116317f3..00000000 --- a/.buildbot/tox-focal/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:focal - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update - -RUN apt-get install -yq --no-install-suggests --no-install-recommends \ - software-properties-common build-essential libcap-dev libffi-dev \ - libssl-dev python-all-dev python-setuptools \ - python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \ - language-pack-en qt5dxcb-plugin tor xvfb - -RUN python3.9 -m pip install --upgrade pip tox virtualenv diff --git a/.buildbot/tox-focal/test.sh b/.buildbot/tox-focal/test.sh deleted file mode 120000 index a9f8525c..00000000 --- a/.buildbot/tox-focal/test.sh +++ /dev/null @@ -1 +0,0 @@ -../tox-bionic/test.sh \ No newline at end of file diff --git a/.buildbot/winebuild/Dockerfile b/.buildbot/winebuild/Dockerfile new file mode 100644 index 00000000..9b687f8f --- /dev/null +++ b/.buildbot/winebuild/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:bionic + +ENV DEBIAN_FRONTEND=noninteractive + +RUN dpkg --add-architecture i386 + +RUN apt-get update + +RUN apt-get install -yq --no-install-suggests --no-install-recommends \ + software-properties-common build-essential libcap-dev libffi-dev \ + libssl-dev python-all-dev python-setuptools xvfb \ + mingw-w64 wine-stable winetricks wine32 wine64 + +ADD . . diff --git a/.buildbot/winebuild/build.sh b/.buildbot/winebuild/build.sh new file mode 100755 index 00000000..fdf5bedc --- /dev/null +++ b/.buildbot/winebuild/build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +xvfb-run -a buildscripts/winbuild.sh || exit 1 + +mkdir -p ../out +mv packages/pyinstaller/dist/Bitmessage*.exe ../out +cd ../out +sha256sum Bitmessage*.exe > SHA256SUMS