X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=.gitlab-ci.yml;h=948cf678306d7afde31d1dd77ba0b9d097e1ecbf;hb=HEAD;hp=c73fa7ab7d1ee7a865c90efb4e3073894ef9b8a8;hpb=8b09ef46a0ff9e97e716db09bf2edb58f0233072;p=fdroidserver.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c73fa7ab..948cf678 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,126 @@
-image: registry.gitlab.com/fdroid/ci-images:server-latest
 
 test:
+  image: registry.gitlab.com/fdroid/ci-images-server:latest
   script:
-    - mkdir -p /usr/lib/python3.4/site-packages/
-    # workaround https://github.com/pypa/setuptools/issues/937
-    - pip3 install setuptools==33.1.1
     - pip3 install -e .
     - cd tests
     - ./complete-ci-tests
 
-# Test that the parsing of the .txt format didn't change. The metadata
-# field 'Author Web Site' was added after 0.7.0, so that can't be part
-# of the test.
+# Test that the parsing of the .txt format didn't change from last
+# released version. This uses the commit ID of the release tags,
+# rather than the release tag itself so that contributor forks do not
+# need to include the tags in them for this test to work.
+#
+# The COMMIT_ID should be bumped after each release, so that the list
+# of sed hacks needed does not continuously grow.
 metadata_v0:
+  image: registry.gitlab.com/fdroid/ci-images-server:latest
+  variables:
+    RELEASE_COMMIT_ID: 2f563f533b3571c80f7a09c6fbb453398658f723  # 1.0.2
   script:
+    - git fetch https://gitlab.com/fdroid/fdroidserver $RELEASE_COMMIT_ID
     - cd tests
-    - cp dump_internal_metadata_format.py dump.py # since this isn't in old commits
-    - git checkout 0.7.0  # or any old commit of your choosing
+    - export GITCOMMIT=`git describe`
+    - git checkout $RELEASE_COMMIT_ID
     - cd ..
-    - sed -i "s/'Author Email',/'Author Email',\n'Author Web Site',/" fdroidserver/metadata.py
     - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata
     - cd fdroiddata
-    - ../tests/dump.py
+    - ../tests/dump_internal_metadata_format.py
     - cd ..
     - git reset --hard
-    - git checkout master
+    - git checkout $GITCOMMIT
     - cd fdroiddata
-    - ../tests/dump.py
-    - "sed -i -e '/AuthorWebSite/d'
-             -e '/Description: No description available/d'
-             -e \"/Description: ''/d\"
-             metadata/dump_*/*.yaml"
+    - ../tests/dump_internal_metadata_format.py
+    - sed -i
+          -e '/Translation:/d'
+          -e '/kivy:\sfalse/d'
+          -e '/timeout:\s/d'
+          metadata/dump_*/*.yaml
     - diff -uw metadata/dump_*
+
+debian_testing:
+  image: debian:testing
+  only:
+    - master@fdroid/fdroidserver
+  script:
+    - apt-get -qy update
+    - apt-get -qy dist-upgrade
+    - apt-get -qy install --no-install-recommends
+        fdroidserver git gnupg python3-setuptools
+    - sed -i -e 's,testing,sid,g' -e  's,testing,sid,g' /etc/apt/sources.list
+    - apt-get -qy update
+    - apt-get install -y --no-install-recommends aapt androguard android-platform-tools-base zipalign
+    - python3 -c 'import fdroidserver'
+    - python3 -c 'import androguard'
+    - export ANDROID_HOME=/usr/lib/android-sdk
+    - export LANG=C.UTF-8
+    - cd tests
+    - ./run-tests
+
+# test using LTS set up with the PPA, including Recommends
+ubuntu_lts:
+  image: ubuntu:latest
+  only:
+    - master@fdroid/fdroidserver
+  script:
+    - while ! apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151; do sleep 15; done
+    - export RELEASE=`sed -n 's,^deb [^ ][^ ]* \([a-z]*\).*,\1,p' /etc/apt/sources.list | head -1`
+    - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
+    - apt-get -qy update
+    - apt-get -qy dist-upgrade
+    - apt-get -qy install fdroidserver git python3-setuptools
+    - export ANDROID_HOME=/usr/lib/android-sdk
+    - export LANG=C.UTF-8
+    - cd tests
+    - ./run-tests
+
+pip_install:
+  image: archlinux/base
+  only:
+    - master@fdroid/fdroidserver
+  script:
+    - pacman --sync --sysupgrade --refresh --noconfirm grep python-pip python-virtualenv tar
+    # setup venv to act as release build machine
+    - python -m venv sdist-env
+    - . sdist-env/bin/activate
+    - ./setup.py compile_catalog sdist
+    - deactivate
+    - tar tzf dist/fdroidserver-*.tar.gz | grep locale/de/LC_MESSAGES/fdroidserver.mo
+    # back to bare machine to act as user's install machine
+    - pip install dist/fdroidserver-*.tar.gz
+    - test -e /usr/share/locale/de/LC_MESSAGES/fdroidserver.mo
+    - fdroid
+    - fdroid readmeta
+    - fdroid update --help
+
+fedora_latest:
+  image: fedora:latest
+  only:
+    - master@fdroid/fdroidserver
+  script:
+    - dnf -y update
+    - dnf -y install git gnupg java-1.8.0-openjdk-devel python3 python3-babel
+                     python3-pip rsync unzip wget
+    - ./setup.py compile_catalog sdist
+    - useradd -m -c "test account" --password "fakepassword"  testuser
+    - su testuser --login --command "cd `pwd`; pip3 install --user dist/fdroidserver-*.tar.gz"
+    - test -e ~testuser/.local/share/locale/de/LC_MESSAGES/fdroidserver.mo
+    - wget --no-verbose -O tools.zip https://dl.google.com/android/repository/tools_r25.2.4-linux.zip
+    - unzip -q tools.zip
+    - rm tools.zip
+    - export AAPT_VERSION=`sed -n "s,^MINIMUM_AAPT_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
+    - export ANDROID_HOME=`pwd`/android-sdk
+    - mkdir $ANDROID_HOME
+    - mv tools $ANDROID_HOME/
+    - mkdir -p $ANDROID_HOME/licenses/
+    - printf "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > $ANDROID_HOME/licenses/android-sdk-license
+    - printf "\n84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license
+    - printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license-old
+    - mkdir ~/.android
+    - touch ~/.android/repositories.cfg
+    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools"
+    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$AAPT_VERSION"
+    - chown -R testuser .
+    - cd tests
+    - su testuser --login --command
+        "cd `pwd`; export ANDROID_HOME=$ANDROID_HOME; fdroid=~testuser/.local/bin/fdroid ./run-tests"