kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-02 07:20:37 +02:00
Code Activity

gitlab-ci: simplify ubuntu_jammy_pip job, babel is not needed

Browse Source 
Babel runs on install now, before it was used to pre-generated the
compiled gettext files.
This commit is contained in:
Hans-Christoph Steiner 2022-10-31 12:55:20 +01:00
parent ffc3fbe288
commit ca13325913
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab-ci.yml
View File

@ -1,3 +1,4 @@
---
variables: variables:
pip: pip3 --timeout 100 --retries 10 pip: pip3 --timeout 100 --retries 10
@ -136,16 +137,14 @@ ubuntu_jammy_pip:
<<: *apt-template <<: *apt-template
script: script:
- apt-get install git default-jdk-headless python3-pip python3-venv rsync - apt-get install git default-jdk-headless python3-pip python3-venv rsync
- rm -rf env
- python3 -m venv env
- . env/bin/activate
- $pip install --upgrade babel pip setuptools
# setup venv to act as release build machine # setup venv to act as release build machine
- python -m venv sdist-env - python3 -m venv sdist-env
- . sdist-env/bin/activate - . sdist-env/bin/activate
- ./setup.py sdist - ./setup.py sdist
- deactivate - deactivate
- tar tzf dist/fdroidserver-*.tar.gz - tar tzf dist/fdroidserver-*.tar.gz
# back to bare machine to act as user's install machine # back to bare machine to act as user's install machine
- export ANDROID_HOME=/opt/android-sdk - export ANDROID_HOME=/opt/android-sdk
- $pip install sdkmanager - $pip install sdkmanager
@ -354,7 +353,7 @@ fdroid build:
# TODO remove sdkmanager install once it is included in the buildserver image # TODO remove sdkmanager install once it is included in the buildserver image
- apt-get install sdkmanager - apt-get install sdkmanager
- rm -rf "$ANDROID_HOME/tools" # TODO remove once sdkmanager can upgrade installed packages - rm -rf "$ANDROID_HOME/tools" # TODO remove once sdkmanager can upgrade installed packages
- sdkmanager "tools" "platform-tools" "build-tools;31.0.0" - sdkmanager "tools" "platform-tools" "build-tools;31.0.0"
- git ls-remote https://gitlab.com/fdroid/fdroiddata.git master - git ls-remote https://gitlab.com/fdroid/fdroiddata.git master
@ -462,7 +461,7 @@ servergitmirrors:
- python3 -m venv --system-site-packages env - python3 -m venv --system-site-packages env
- . env/bin/activate - . env/bin/activate
- export PYTHONPATH=`pwd` - export PYTHONPATH=`pwd`
- export SETUPTOOLS_USE_DISTUTILS=stdlib # https://github.com/pypa/setuptools/issues/2956 - export SETUPTOOLS_USE_DISTUTILS=stdlib # https://github.com/pypa/setuptools/issues/2956
- $pip install -e . - $pip install -e .
- mkdir /root/.ssh/ - mkdir /root/.ssh/
- ./tests/key-tricks.py - ./tests/key-tricks.py

5
.yamllint Normal file
View File

@ -0,0 +1,5 @@
---
extends: default
rules:
line-length: disable