Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Remove CI scripts
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 38920087 by lovetox at 2021-01-03T13:28:53+01:00 Remove CI scripts They are now loaded from the ci repo - - - - - 2 changed files: - − scripts/ci/appveyor.py - − scripts/ci/sdist.py Changes: ===================================== scripts/ci/appveyor.py deleted ===================================== @@ -1,22 +0,0 @@ -#!/usr/bin/env python3 - -import os -import requests - -webhook_key = os.environ['APPVEYOR_WEBHOOK_KEY'] -branch = os.environ['CI_COMMIT_BRANCH'] - -url = f'https://ci.appveyor.com/api/git/webhook?id={webhook_key}' -ref = f'refs/heads/{branch}' - -with open('appveyor.yml', 'r') as file: - yaml = file.read() - -payload = { - 'ref': ref, - 'repository': {'name': 'Gajim'}, - 'config': yaml -} - -req = requests.post(url, json=payload) -req.raise_for_status() ===================================== scripts/ci/sdist.py deleted ===================================== @@ -1,62 +0,0 @@ -#!/usr/bin/env python3 - -import os -import io -import zipfile -import subprocess -import shutil -from pathlib import Path -import requests - -PLUGINS = [ - 'plugin_installer', -] - -PLUGINS_BASE_URL = 'https://ftp.gajim.org' -PLUGINS_FOLDER = Path('./gajim/data/plugins') - -COMMIT_BRANCH = os.environ['CI_COMMIT_BRANCH'] - - -def get_plugins_folder(): - if COMMIT_BRANCH == 'master': - return 'plugins_master_zip' - - version = COMMIT_BRANCH.split('_')[1] - return f'plugins_{version}_zip' - - -def get_plugins_url(plugin): - folder = get_plugins_folder() - return f'{PLUGINS_BASE_URL}/{folder}/{plugin}.zip' - - -def extraxt_zip(zip_bytes, path): - print('Extract to', path) - with zipfile.ZipFile(io.BytesIO(zip_bytes)) as zip_file: - zip_file.extractall(path) - - -def download_plugins(): - PLUGINS_FOLDER.mkdir(parents=True) - for plugin in PLUGINS: - url = get_plugins_url(plugin) - print('Download', url) - req = requests.get(url) - req.raise_for_status() - extraxt_zip(req.content, PLUGINS_FOLDER) - - -def setup(): - print('Setup') - subprocess.call(['python3', 'setup.py', 'sdist']) - - -def cleanup(): - print('Cleanup') - shutil.rmtree(PLUGINS_FOLDER) - - -download_plugins() -setup() -cleanup() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/389200873d619972e38f5083bd107a76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/389200873d619972e38f5083bd107a76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch settings
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist deleted branch settings at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] Stop running CI
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 0af40757 by lovetox at 2021-01-03T12:50:54+01:00 Stop running CI - - - - - 1 changed file: - − .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml deleted ===================================== @@ -1,50 +0,0 @@ -before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 gir1.2-soup-2.4 python3-gi python3-cairo - - sudo apt-get build-dep -y -qq gajim-default-nightly - -stages: - - test - - build - -run-tests: - stage: test - script: - - rm -rf civenv-master - - 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@master - - pip3 install -I pylint==2.4.4 - - pip3 install -I codespell - - mypy -V - - mypy gajim - - scripts/dev/pylint-ci.sh --jobs=2 gajim - - python3 -m unittest discover -s test/no_gui -v - - codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim - - deactivate - - rm -rf civenv-master - -run-appdata: - stage: test - script: - - appstream-util validate data/org.gajim.Gajim.appdata.xml.in - -run-build: - stage: build - script: - - python3 setup.py sdist - - cd dist - - GF=$(basename gajim-* .tar.gz) - - gzip -d $GF.tar.gz - - mkdir -p $GF/gajim/data/plugins/ - - curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip - - unzip plugin_installer.zip -d $GF/gajim/data/plugins/ - - rm plugin_installer.zip - - tar -uf $GF.tar $GF - - gzip $GF.tar - - artifacts: - name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" - expire_in: 1 week - paths: - - dist/gajim-*.tar.gz View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0af407571b8cc4cd15512c3d737853f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0af407571b8cc4cd15512c3d737853f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Stop running CI
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: fe1f0270 by lovetox at 2021-01-03T12:51:11+01:00 Stop running CI - - - - - 1 changed file: - − .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml deleted ===================================== @@ -1,57 +0,0 @@ -before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo - - sudo apt-get build-dep -y -qq gajim-default-nightly - -stages: - - test - - build - -run-tests: - stage: test - script: - - rm -rf civenv-master - - virtualenv -p python3 --system-site-packages civenv - - . ./civenv/bin/activate - - pip3 install -I mypy - - pip3 install -I nbxmpp==0.6.10 - - pip3 install -I pylint==2.1.1 - - mypy gajim - - scripts/dev/pylint-ci.sh --jobs=2 gajim - - python3 setup.py test -s test.no_gui - - deactivate - - rm -rf civenv-master - -run-appdata: - stage: test - script: - - appstream-util validate data/org.gajim.Gajim.appdata.xml.in - -run-build: - stage: build - script: - - python3 setup.py sdist - - cd dist - - export FN="gajim-default-"$(date +%F)".tar" - - mv gajim-*.tar.gz $FN.gz - - mkdir tmp_add_plugins - - mv $FN.gz tmp_add_plugins/ - - cd tmp_add_plugins/ - - tar xzf $FN.gz - - rm $FN.gz - - export GF=$(find . -maxdepth 1 -type d -name 'gajim-*') - - mkdir -p $GF/gajim/data/plugins/ - - cd $GF/gajim/data/plugins/ - - curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip - - unzip plugin_installer.zip - - rm plugin_installer.zip - - cd ../../../.. - - tar czf ../$FN.gz gajim-* - - cd .. - - rm -rf tmp_add_plugins - - scp $FN.gz panoramix:/var/www/gajim/downloads/snap/ci/gajim-default-$CI_COMMIT_SHA.tar.gz - - artifacts: - name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" - expire_in: 1 week - paths: - - gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA.tar.gz View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fe1f0270da26b34b8205e4a544d6f838… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fe1f0270da26b34b8205e4a544d6f838… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Stop running CI
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: a9c2d17c by lovetox at 2021-01-03T12:52:14+01:00 Stop running CI - - - - - 1 changed file: - − .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml deleted ===================================== @@ -1,47 +0,0 @@ -before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly pylint3 - - sudo apt-get build-dep -y -qq gajim-default-nightly - -stages: - - test - - build - -run-test: - stage: test - script: - - python3 setup.py test_nogui - -run-pylint: - stage: test - script: - - pylint3 --additional-builtins=_ --disable=all --enable=E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,W0102 gajim - -run-build: - stage: build - script: - - python3 setup.py sdist - - cd dist - - export FN="gajim-default-"$(date +%F)".tar" - - mv gajim-*.tar.gz $FN.gz - - mkdir tmp_add_plugins - - mv $FN.gz tmp_add_plugins/ - - cd tmp_add_plugins/ - - tar xzf $FN.gz - - rm $FN.gz - - export GF=$(find . -maxdepth 1 -type d -name 'gajim-*') - - mkdir -p $GF/gajim/data/plugins/ - - cd $GF/gajim/data/plugins/ - - curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip - - unzip plugin_installer.zip - - rm plugin_installer.zip - - cd ../../../.. - - tar czf ../$FN.gz gajim-* - - cd .. - - rm -rf tmp_add_plugins - - scp $FN.gz panoramix:/var/www/gajim/downloads/snap/ci/gajim-default-$CI_COMMIT_SHA.tar.gz - - artifacts: - name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" - expire_in: 1 week - paths: - - gajim-default-2???-??-??.tar.gz View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9c2d17ced869cca012b5a4c5315af3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9c2d17ced869cca012b5a4c5315af3c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update gitlab-ci.yml
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 333eed68 by lovetox at 2021-01-03T12:45:38+01:00 Update gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -4,5 +4,5 @@ include: file: '.gajim-ci.yml' variables: - NBXMPP_BRANCH: nbxmpp_2.0 - PLUGINS_BRANCH: gajim_1.3 + NBXMPP_BRANCH: master + PLUGINS_BRANCH: master View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/333eed68cd12fcaec91efd308da85f0d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/333eed68cd12fcaec91efd308da85f0d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Add gitlab-cy.yml
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 00945743 by lovetox at 2021-01-03T12:45:05+01:00 Add gitlab-cy.yml - - - - - 1 changed file: - + .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -0,0 +1,8 @@ +include: +- project: 'gajim/ci' + ref: master + file: '.gajim-ci.yml' + +variables: + NBXMPP_BRANCH: nbxmpp_2.0 + PLUGINS_BRANCH: gajim_1.3 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0094574328b8427404799d3eebb34c3b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0094574328b8427404799d3eebb34c3b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add gitlab-ci.yml
by Philipp Hörist 03 Jan '21

03 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: bb94be8f by lovetox at 2021-01-03T12:43:17+01:00 Add gitlab-ci.yml - - - - - 1 changed file: - + .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -0,0 +1,8 @@ +include: +- project: 'gajim/ci' + ref: master + file: '.gajim-ci.yml' + +variables: + NBXMPP_BRANCH: nbxmpp_2.0 + PLUGINS_BRANCH: gajim_1.3 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb94be8f69500030dea944d14595fd66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb94be8f69500030dea944d14595fd66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 2 commits: DOAP: Use schema.org properties for documentation logo and screenshot
by Philipp Hörist 02 Jan '21

02 Jan '21

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#"> +<Project xmlns="http://usefulinc.com/ns/doap#" xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" - xmlns:foaf="http://xmlns.com/foaf/0.1/"> - <Project> - + xmlns:foaf="http://xmlns.com/foaf/0.1/" + xmlns:schema="https://schema.org/"> <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"/> + <schema:documentation rdf:resource="https://dev.gajim.org/gajim/gajim/-/wikis/home"/> <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"/> - <xmpp:screenshot rdf:resource="https://gajim.org/img/screenshots/single-window-mode.png"/> + <schema:logo rdf:resource="https://gajim.org/img/gajim-logo.svg"/> + <schema:screenshot rdf:resource="https://gajim.org/img/screenshots/single-window-mode.png"/> <programming-language>Python</programming-language> <os>Linux</os> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6febd63699e3b6d37b05fd2ce27ff3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6febd63699e3b6d37b05fd2ce27ff3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use ci configuration from ci repository
by Philipp Hörist 02 Jan '21

02 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7dd204ab by lovetox at 2021-01-02T22:24:02+01:00 Use ci configuration from ci repository - - - - - 1 changed file: - − .gitlab-ci.yml 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@master - - 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 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7dd204abf907eaa6fc68ac648732c206… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7dd204abf907eaa6fc68ac648732c206… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits