Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim

Commits: ab5414fb by wurstsalat at 2021-01-02T22:24:44+01:00 DOAP: Use schema.org properties for documentation logo and screenshot

- - - - - 0a2f5b28 by lovetox at 2021-01-02T22:25:03+01:00 Use ci configuration from ci repository

- - - - -

2 changed files:

- − .gitlab-ci.yml - data/gajim.doap

Changes:

===================================== .gitlab-ci.yml deleted ===================================== @@ -1,78 +0,0 @@ -workflow: - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - when: never - - when: always - -stages: - - test - - build - -Code Quality: - stage: test - rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' - when: never - - when: always - script: - - rm -rf civenv - - virtualenv -p python3 --system-site-packages civenv - - . ./civenv/bin/activate - - pip3 install -I mypy - - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git@nbxmpp_2.0 - - pip3 install -I pylint==2.4.4 - - pip3 install -I codespell - - pip3 install -I coverage - - pip3 install -I css-parser - - pip3 install -I keyring - - pip3 install -I packaging - - pip3 install -I precis-i18n - - pip3 install -I pyOpenSSL - - mypy -V - - mypy gajim - - scripts/ci/pylint.sh --jobs=2 gajim - - coverage run --source=gajim -m unittest discover -s test/no_gui -v - - coverage report -mi - - coverage xml -i - - codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim - - deactivate - - rm -rf civenv - coverage: "/TOTAL.+ ([0-9]{1,3}%)/" - artifacts: - reports: - cobertura: coverage.xml - interruptible: true - -appdata.xml: - stage: test - rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' - when: never - - when: always - script: - - python3 setup.py build - - appstream-util validate build/data/org.gajim.Gajim.appdata.xml - interruptible: true - -Linux: - stage: build - rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' - when: never - - when: always - script: - - ./scripts/ci/sdist.py - - artifacts: - name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" - expire_in: 1 week - paths: - - dist/gajim-*.tar.gz - interruptible: true - -Windows: - stage: build - rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' - script: - - ./scripts/ci/appveyor.py

===================================== data/gajim.doap ===================================== @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet href="https://gajim.org/files/doap-style.xsl" type="text/xsl"?> -<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" +<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#%22%3E +<Project xmlns="http://usefulinc.com/ns/doap#" xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" - xmlns:foaf="http://xmlns.com/foaf/0.1/%22%3E - <Project> - + xmlns:foaf="http://xmlns.com/foaf/0.1/" + xmlns:schema="https://schema.org/%22%3E <name>Gajim</name> <short-name>gajim</short-name>

@@ -19,7 +18,7 @@

<homepage rdf:resource="https://gajim.org/"/> <download-page rdf:resource="https://gajim.org/download"/> - <xmpp:documentation rdf:resource="https://dev.gajim.org/gajim/gajim/-/wikis/home%22/%3E + <schema:documentation rdf:resource="https://dev.gajim.org/gajim/gajim/-/wikis/home%22/%3E <wiki rdf:resource="https://dev.gajim.org/gajim/gajim/-/wikis/home"/> <bug-database rdf:resource="https://dev.gajim.org/gajim/gajim/issues"/> <developer-forum rdf:resource="xmpp:gajim@conference.gajim.org?join"/> @@ -27,8 +26,8 @@ <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-client"/> <category rdf:resource="http://api.gnome.org/doap-extensions#apps"/> <license rdf:resource="http://usefulinc.com/doap/licenses/gplv3"/> - <xmpp:logo rdf:resource="https://gajim.org/img/gajim-logo.svg%22/%3E - <xmpp:screenshot rdf:resource="https://gajim.org/img/screenshots/single-window-mode.png%22/%3E + <schema:logo rdf:resource="https://gajim.org/img/gajim-logo.svg%22/%3E + <schema:screenshot rdf:resource="https://gajim.org/img/screenshots/single-window-mode.png%22/%3E

<programming-language>Python</programming-language> <os>Linux</os>

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6febd63699e3b6d37b05fd2ce27ff35...