From 406652988a35020839164cf5a1b245cf879a319a Mon Sep 17 00:00:00 2001 From: FestplattenSchnitzel Date: Sat, 28 Jan 2023 16:38:48 +0100 Subject: [PATCH 1/2] Remove references to Travis CI We do not use it any longer. --- .travis.yml | 92 ----------------------------------------------------- README.md | 11 +++---- 2 files changed, 5 insertions(+), 98 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 44c7ea70..00000000 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ - -# Use the Android base system since it provides the SDK, etc. -language: java - -matrix: - include: - - os: osx - osx_image: xcode12 - env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk - env: ANDROID_HOME=/usr/local/share/android-sdk - - os: osx - osx_image: xcode10.3 - env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk - env: ANDROID_HOME=/usr/local/share/android-sdk - -android: - components: - - android-23 # required for `fdroid build` test - - build-tools-28.0.3 # required for `fdroid build` test - licenses: - - 'android-sdk-preview-.+' - - 'android-sdk-license-.+' - -# * ensure java8 is installed since Android SDK doesn't work with Java9 -# * Java needs to be at least 1.8.0_131 to have MD5 properly disabled -# https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default -# https://opsech.io/posts/2017/Jun/09/openjdk-april-2017-security-update-131-8u131-and-md5-signed-jars.html -# * mercurial is unused and requires Python 2.x -install: - - export HOMEBREW_CURL_RETRIES=10 - - brew update > /dev/null - - if [ "`sw_vers -productVersion | sed 's,10\.\([0-9]*\).*,\1,'`" -ge 14 ]; then - python3 --version; - elif [ "`sw_vers -productVersion | sed 's,10\.\([0-9]*\).*,\1,'`" -gt 10 ]; then - brew uninstall mercurial --force; - brew upgrade python; - else - brew install python3; - fi - - brew install dash bash gnu-sed gradle jenv - - export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH" - - brew uninstall java --force || true - - brew cask uninstall java --force || true - - brew tap adoptopenjdk/openjdk - - travis_retry brew install --cask adoptopenjdk8 - - export JAVA_HOME=`/usr/libexec/java_home -v 1.8` - - travis_retry brew install --cask android-sdk - - - export AAPT_VERSION=`sed -n "s,^MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py` - - mkdir -p "$ANDROID_HOME/licenses" - - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license" - - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license" - - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" - - echo y | travis_retry $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" > /dev/null - - echo y | travis_retry $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$AAPT_VERSION" > /dev/null - - echo y | travis_retry $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23" > /dev/null - - - travis_retry sudo pip3 install --progress-bar off babel - - travis_retry sudo pip3 install --quiet --progress-bar off --editable . - - sudo rm -rf fdroidserver.egg-info - - - ls -l /System/Library/Java/JavaVirtualMachines || true - - ls -l /Library/Java/JavaVirtualMachines || true - - for f in /Library/Java/JavaVirtualMachines/*.jdk; do jenv add $f; done - - echo $PATH - - echo $JAVA_HOME - - jenv versions - - /usr/libexec/java_home - - java -version - - which java - - javac -version - - which javac - - jarsigner -help - - which jarsigner - - keytool -help - - which keytool - - sudo rm -rf /Library/Java/JavaVirtualMachines/jdk1.8.0_1*.jdk || true - -# The OSX tests seem to run slower, they often timeout. So only run -# the test suite with the installed version of fdroid. -# -# macOS sticks with bash 3.x because of licenses, so avoid use new bash syntax -script: - - /bin/bash --version - - /bin/bash -n gradlew-fdroid tests/run-tests - - - ./tests/run-tests - -after_failure: - - cd $TRAVIS_BUILD_DIR - - ls -lR | curl -F 'clbin=<-' https://clbin.com diff --git a/README.md b/README.md index c96dc872..7bd42b50 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,9 @@ find the source for the documentation in ## CI/CD status -| | fdroidserver | buildserver | fdroid build --all | publishing tools | -|--------------------------|:-------------:|:-----------:|:------------------:|:----------------:| -| GNU/Linux | [![fdroidserver status on GNU/Linux](https://gitlab.com/fdroid/fdroidserver/badges/master/pipeline.svg)](https://gitlab.com/fdroid/fdroidserver/-/jobs) | [![buildserver status](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment/badge/icon)](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment) | [![fdroid build all status](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/) | [![fdroid test status](https://jenkins.debian.net/job/reproducible_fdroid_test/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_test/) | -| macOS | [![fdroidserver status on macOS](https://travis-ci.org/f-droid/fdroidserver.svg?branch=master)](https://travis-ci.org/f-droid/fdroidserver) | | | | +| fdroidserver | buildserver | fdroid build --all | publishing tools | +|:-------------:|:-----------:|:------------------:|:----------------:| +| [![fdroidserver status on GNU/Linux](https://gitlab.com/fdroid/fdroidserver/badges/master/pipeline.svg)](https://gitlab.com/fdroid/fdroidserver/-/jobs) | [![buildserver status](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment/badge/icon)](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment) | [![fdroid build all status](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/) | [![fdroid test status](https://jenkins.debian.net/job/reproducible_fdroid_test/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_test/) | ## Installing @@ -102,7 +101,7 @@ It can be built locally via pip install -e .[docs] cd docs sphinx-apidoc -o ./source ../fdroidserver -M -e -sphinx-autogen -o generated source/*.rst +sphinx-autogen -o generated source/*.rst make html ``` @@ -119,7 +118,7 @@ When writing docstrings you should follow the Everything can be translated. See [Translation and Localization](https://f-droid.org/docs/Translation_and_Localization) -for more info. +for more info.
From 1074b5938d7ac7fd9c31088c8170bd8dad90450c Mon Sep 17 00:00:00 2001 From: FestplattenSchnitzel Date: Sat, 28 Jan 2023 16:54:58 +0100 Subject: [PATCH 2/2] README: Remove CI/CD status section --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 7bd42b50..9a11de8b 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,6 @@ find the source for the documentation in [fdroid/fdroid-website](https://gitlab.com/fdroid/fdroid-website). -## CI/CD status - -| fdroidserver | buildserver | fdroid build --all | publishing tools | -|:-------------:|:-----------:|:------------------:|:----------------:| -| [![fdroidserver status on GNU/Linux](https://gitlab.com/fdroid/fdroidserver/badges/master/pipeline.svg)](https://gitlab.com/fdroid/fdroidserver/-/jobs) | [![buildserver status](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment/badge/icon)](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment) | [![fdroid build all status](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/) | [![fdroid test status](https://jenkins.debian.net/job/reproducible_fdroid_test/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_test/) | - - ## Installing There are many ways to install _fdroidserver_, they are documented on