Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: CI: Fix typo
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05a09c20 by lovetox at 2022-03-27T15:33:31+02:00 chore: CI: Fix typo - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -77,7 +77,7 @@ deploy-linux: variables: DEPLOY_TYPE: "linux" script: - - python3 .ci/deploy.py sdist + - python3 .ci/deploy.py dist deploy-windows: stage: deploy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/05a09c205c1bbf11160de370a41cb617… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/05a09c205c1bbf11160de370a41cb617… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: CI: Name nightly tarballs different
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9fa3fb9e by lovetox at 2022-03-27T15:00:55+02:00 chore: CI: Name nightly tarballs different So we can compare them to the currenly running jobs - - - - - 1 changed file: - .ci/deploy.py Changes: ===================================== .ci/deploy.py ===================================== @@ -109,7 +109,7 @@ def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: def deploy_linux_nightly(ftp: FTP_TLS, filedir: Path) -> None: ftp.cwd(LINUX_NIGHTLY_FOLDER) filepath = find_linux_tarball(filedir) - filename = f'gajim-{date.today().isoformat()}.tar.gz' + filename = f'gajim-{date.today().isoformat()}-test.tar.gz' upload_file(ftp, filepath, name=filename) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fa3fb9e093a13e47c8c2cc6b7f5da3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fa3fb9e093a13e47c8c2cc6b7f5da3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: CI: Add linux deploy jobs
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1fda4597 by lovetox at 2022-03-27T14:56:05+02:00 chore: CI: Add linux deploy jobs - - - - - 4 changed files: - .ci/deploy.py - .ci/sdist.py - .gitlab-ci.yml - pyrightconfig.json Changes: ===================================== .ci/deploy.py ===================================== @@ -1,17 +1,24 @@ +from typing import Any +from typing import Optional + +import functools import os import sys +from datetime import date from ftplib import FTP_TLS from pathlib import Path -import functools -from typing import Any from rich.console import Console + FTP_URL = 'panoramix.gajim.org' FTP_USER = os.environ['FTP_USER'] FTP_PASS = os.environ['FTP_PASS'] -WINDOWS_NIGHTLY_FOLDER = 'win_snap' +WINDOWS_NIGHTLY_FOLDER = 'downloads/snap/win' +LINUX_NIGHTLY_FOLDER = 'downloads/snap' + +RELEASE_FOLDER_BASE = 'downloads' console = Console() @@ -37,24 +44,44 @@ def get_gajim_tag() -> str: tag = os.environ.get('CI_COMMIT_TAG') if tag is None: exit('No tag found') - return tag.removesuffix('gajim-') + return tag.removeprefix('gajim-') + + +def find_linux_tarball(filedir: Path) -> Path: + files = list(filedir.glob('gajim-*.tar.gz')) + if len(files) != 1: + exit('Unknown files found') + return files[0] def get_dir_list(ftp: FTP_TLS) -> list[str]: return [x[0] for x in ftp.mlsd()] -def ensure_folder_exists(ftp: FTP_TLS, dirname: str) -> None: +def create_release_folder(ftp: FTP_TLS, tag: str) -> None: + ftp.cwd(RELEASE_FOLDER_BASE) + folder = get_release_folder_from_tag(tag) dir_list = get_dir_list(ftp) - if dirname not in dir_list: - ftp.mkd(dirname) + if folder not in dir_list: + ftp.mkd(folder) + ftp.cwd(folder) + + +def upload_all_from_dir(ftp: FTP_TLS, filedir: Path) -> None: + for filepath in filedir.iterdir(): + upload_file(ftp, filepath) + +def upload_file(ftp: FTP_TLS, + filepath: Path, + name: Optional[str] = None) -> None: -def upload_all_from_dir(ftp: FTP_TLS, dir: Path) -> None: - for file_path in dir.iterdir(): - console.print('Upload file', file_path.name) - with open(file_path, 'rb') as f: - ftp.storbinary('STOR ' + file_path.name, f) + if name is None: + name = filepath.name + + console.print('Upload file', filepath.name, 'as', name) + with open(filepath, 'rb') as f: + ftp.storbinary('STOR ' + name, f) def get_deploy_method() -> str: @@ -74,20 +101,25 @@ def deploy_windows_nightly(ftp: FTP_TLS, filedir: Path) -> None: @ftp_connection def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: tag = get_gajim_tag() - folder = get_release_folder_from_tag(tag) - ensure_folder_exists(ftp, folder) - ftp.cwd(folder) + create_release_folder(ftp, tag) upload_all_from_dir(ftp, filedir) @ftp_connection -def deploy_linux_nightly(): - raise NotImplementedError +def deploy_linux_nightly(ftp: FTP_TLS, filedir: Path) -> None: + ftp.cwd(LINUX_NIGHTLY_FOLDER) + filepath = find_linux_tarball(filedir) + filename = f'gajim-{date.today().isoformat()}.tar.gz' + upload_file(ftp, filepath, name=filename) @ftp_connection -def deploy_linux_release(): - raise NotImplementedError +def deploy_linux_release(ftp: FTP_TLS, file: Path) -> None: + tag = get_gajim_tag() + create_release_folder(ftp, tag) + filepath = find_linux_tarball(filedir) + filename = f'gajim-{tag}.tar.gz' + upload_file(ftp, filepath, name=filename) if __name__ == '__main__': ===================================== .ci/sdist.py ===================================== @@ -1,11 +1,16 @@ #!/usr/bin/env python3 import io -import zipfile -import subprocess +import requests import shutil +import subprocess +import zipfile from pathlib import Path -import requests + +from rich.console import Console + +console = Console() + PLUGINS = [ 'plugin_installer', @@ -15,36 +20,37 @@ PLUGINS_FOLDER = Path('./gajim/data/plugins') -def get_plugins_url(plugin): +def get_plugins_url(plugin: str) -> str: return f'{PLUGINS_BASE_URL}/plugins_master_zip/{plugin}.zip' -def extraxt_zip(zip_bytes, path): - print('Extract to', path) +def extraxt_zip(zip_bytes: bytes, path: Path) -> None: + console.print('Extract to', path) with zipfile.ZipFile(io.BytesIO(zip_bytes)) as zip_file: zip_file.extractall(path) -def download_plugins(): +def download_plugins() -> None: PLUGINS_FOLDER.mkdir(parents=True) for plugin in PLUGINS: url = get_plugins_url(plugin) - print('Download', url) + console.print('Download', url) req = requests.get(url) req.raise_for_status() extraxt_zip(req.content, PLUGINS_FOLDER) -def setup(): - print('Setup') +def setup() -> None: + console.print('Setup') subprocess.call(['python3', 'setup.py', 'sdist']) -def cleanup(): - print('Cleanup') +def cleanup() -> None: + console.print('Cleanup') shutil.rmtree(PLUGINS_FOLDER) -download_plugins() -setup() -cleanup() +if __name__ == '__main__': + download_plugins() + setup() + cleanup() ===================================== .gitlab-ci.yml ===================================== @@ -45,7 +45,6 @@ build-linux: rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' - when: manual script: - python3 .ci/sdist.py @@ -68,6 +67,18 @@ build-windows: paths: - build/Gajim-*.exe +deploy-linux: + stage: deploy + needs: ['build-linux'] + rules: + - if: '$GAJIM_NIGHTLY_BUILD' + - if: '$CI_COMMIT_TAG' + when: manual + variables: + DEPLOY_TYPE: "linux" + script: + - python3 .ci/deploy.py sdist + deploy-windows: stage: deploy needs: ['build-windows'] ===================================== pyrightconfig.json ===================================== @@ -4,7 +4,12 @@ "typeCheckingMode": "strict", "reportImportCycles": "none", "reportImplicitStringConcatenation": "none", + "exclude": [ + "**/__pycache__", + ".git" + ], "include": [ + ".ci/*", "gajim/gajim.py", "gajim/common/application.py", "gajim/common/cert_store.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1fda4597a0f9695cd27ef605e4a3f600… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1fda4597a0f9695cd27ef605e4a3f600… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Move all ci scripts into .ci folder
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2bb4f344 by lovetox at 2022-03-27T13:50:12+02:00 chore: Move all ci scripts into .ci folder - - - - - 7 changed files: - win/ci/appveyor.yml → .ci/appveyor.yml - win/ci/appveyor_build.py → .ci/appveyor_build.py - scripts/ci/deploy.py → .ci/deploy.py - scripts/ci/link-gtk.py → .ci/link-gtk.py - scripts/ci/pylint.sh → .ci/pylint.sh - scripts/ci/sdist.py → .ci/sdist.py - .gitlab-ci.yml Changes: ===================================== win/ci/appveyor.yml → .ci/appveyor.yml ===================================== ===================================== win/ci/appveyor_build.py → .ci/appveyor_build.py ===================================== @@ -36,7 +36,7 @@ def get_gajim_version() -> str: def push_yaml_to_project() -> None: console.print('Push settings ...') - with open('./win/ci/appveyor.yml', 'r') as file: + with open('.ci/appveyor.yml', 'r') as file: yaml = file.read() req = requests.put(SETTINGS_API_URL, data=yaml, headers=HEADERS) ===================================== scripts/ci/deploy.py → .ci/deploy.py ===================================== ===================================== scripts/ci/link-gtk.py → .ci/link-gtk.py ===================================== ===================================== scripts/ci/pylint.sh → .ci/pylint.sh ===================================== ===================================== scripts/ci/sdist.py → .ci/sdist.py ===================================== ===================================== .gitlab-ci.yml ===================================== @@ -17,7 +17,7 @@ pyright: - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - python3 -V - - python3 scripts/ci/link-gtk.py + - python3 .ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright interruptible: true @@ -27,7 +27,7 @@ code-quality: script: - python3 -V - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git - - scripts/ci/pylint.sh --jobs=2 gajim + - .ci/pylint.sh --jobs=2 gajim - coverage run --source=gajim -m unittest discover -s test -v - coverage report -mi - coverage xml -i @@ -47,7 +47,7 @@ build-linux: - if: '$CI_COMMIT_TAG' when: manual script: - - python3 ./scripts/ci/sdist.py + - python3 .ci/sdist.py artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" @@ -61,7 +61,7 @@ build-windows: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - - python3 ./win/ci/appveyor_build.py + - python3 .ci/appveyor_build.py artifacts: expire_in: 1 day @@ -78,7 +78,7 @@ deploy-windows: variables: DEPLOY_TYPE: "windows" script: - - python3 ./scripts/ci/deploy.py build + - python3 .ci/deploy.py build deploy-flatpak: stage: deploy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2bb4f344163c98f5bc2383c89812e11a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2bb4f344163c98f5bc2383c89812e11a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add git update server-side hook
by Philipp Hörist (＠lovetox) 26 Mar '22

26 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7db8a080 by lovetox at 2022-03-27T00:19:42+01:00 Add git update server-side hook - - - - - 0bd54254 by lovetox at 2022-03-27T00:24:02+01:00 Update CONTRIBUTING.md - - - - - 2 changed files: - + .githooks/update - CONTRIBUTING.md Changes: ===================================== .githooks/update ===================================== @@ -0,0 +1,50 @@ +#!/usr/bin/env python + +import sys +import subprocess + + +ALLOWED_TAGS = ['feat', 'fix', 'perf', 'refactor', 'chore', 'other'] + + +def parse_args() -> tuple[str, str]: + old_ref = sys.argv[2] + new_ref = sys.argv[3] + return old_ref, new_ref + + +def get_commit_subject(sha: str) -> str: + data = subprocess.check_output( + ['git', 'log', '-1', '--pretty=format:%s', sha]) + return data.decode() + + +def get_commit_shas(start_ref: str, end_ref: str) -> list[str]: + arg = f'{start_ref}..{end_ref}' + data = subprocess.check_output(['git', 'rev-list', arg]) + text = data.decode() + text = text.strip() + return text.split('\n') + + +def enforce_message_rules(subject: str) -> None: + tag, subject = subject.split(': ', maxsplit=1) + if tag not in ALLOWED_TAGS: + print('Unknown commit message tag:', tag) + sys.exit(1) + + if not subject[0].isupper(): + print('First letter after tag must be uppercase') + sys.exit(1) + + +def main(args: tuple[str, str]) -> None: + shas = get_commit_shas(*args) + for sha in shas: + subject = get_commit_subject(sha) + enforce_message_rules(subject) + + +if __name__ == "__main__": + args = parse_args() + main(args) ===================================== CONTRIBUTING.md ===================================== @@ -1,3 +1,4 @@ +# Project If you want to create a fork and use an external account (Github, Google) drop us a message at the Gajim support [group chat](xmpp:gajim@conference.gajim.org?join) so we can give you the necessary rights @@ -6,6 +7,24 @@ - gajim_1.0 - Stable Gajim 1.0.x branch - gajim_0.16 - Stable Gajim 0.16.x branch + +# Commit Messages + If you are not familiar with Git please read the [HowTo](https://dev.gajim.org/gajim/gajim/wikis/development/howtogit) A good article regarding [good commit messages](https://chris.beams.io/posts/git-commit/) + +Every commit message must be prefixed with one of the following tags: + +- feat +- fix +- perf +- refactor +- chore +- other + +Further the first letter after the tag must be upper case + +Example: + +`feat: New Button which does something` View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b059dfb254aabd7b1f28c6a49641e39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b059dfb254aabd7b1f28c6a49641e39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist (＠lovetox) 26 Mar '22

26 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b059dfb2 by lovetox at 2022-03-26T22:42:16+01:00 Remove unused imports - - - - - 2 changed files: - scripts/ci/deploy.py - win/ci/appveyor_build.py Changes: ===================================== scripts/ci/deploy.py ===================================== @@ -1,6 +1,6 @@ import os import sys -from ftplib import FTP_TLS, ftpcp +from ftplib import FTP_TLS from pathlib import Path import functools from typing import Any ===================================== win/ci/appveyor_build.py ===================================== @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -from typing import Iterator - import os import requests import time View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b059dfb254aabd7b1f28c6a49641e392… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b059dfb254aabd7b1f28c6a49641e392… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Appveyor: Specify commit sha when starting build
by Philipp Hörist (＠lovetox) 26 Mar '22

26 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cd609cb by lovetox at 2022-03-26T22:41:38+01:00 Appveyor: Specify commit sha when starting build Builds take a very long time, while one job is running, new commits can be made, which means the next job builds a different commit. - - - - - 1 changed file: - win/ci/appveyor_build.py Changes: ===================================== win/ci/appveyor_build.py ===================================== @@ -51,6 +51,7 @@ def start_build() -> str: 'accountName': ACCOUNT, 'projectSlug': PROJECT_SLUG, 'branch': BRANCH, + 'commitId': os.environ['CI_COMMIT_SHA'], 'environmentVariables': { 'GAJIM_VERSION': get_gajim_version(), } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cd609cb304f17f39ef338730c552a26… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cd609cb304f17f39ef338730c552a26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GitLab: Add Release Template
by Philipp Hörist (＠lovetox) 26 Mar '22

26 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d377278 by lovetox at 2022-03-26T20:13:54+01:00 GitLab: Add Release Template - - - - - 1 changed file: - + .gitlab/issue_templates/Release.md Changes: ===================================== .gitlab/issue_templates/Release.md ===================================== @@ -0,0 +1,21 @@ +*Release date: xx xxx xxxx* + +## Things to do before release: + +* [ ] xxx + +## Build +* [ ] Update `ChangeLog` +* [ ] Raise version in `gajim/__init__.py` +* [ ] Raise version in `data/org.gajim.Gajim.appdata.xml.in` +* [ ] Merge translations from Weblate +* [ ] Push release tag `gajim-x.x.x` +* [ ] Update Debian repository on gajim.org + +## Update +* [ ] Notify package maintainers to include new release (announce via mailing list) +* [ ] Website: Write announcement post with changelog +* [ ] Website: Update Download section on gajim.org (set [current version and update installer links](https://dev.gajim.org/gajim/website/blob/master/themes/beautifulhugo…) +* [ ] Website: Update screenshots +* [ ] Website: Merge website translations from Weblate +* [ ] MUC: Update MUC subject on gajim(a)conference.gajim.org View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d377278289d0e53ea32292e203599bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d377278289d0e53ea32292e203599bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor CI Pipelines
by Philipp Hörist (＠lovetox) 26 Mar '22

26 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e09c2c82 by lovetox at 2022-03-26T19:33:58+01:00 Refactor CI Pipelines - Move tasks to python scripts - Rework appveyor build - Add deploy jobs - - - - - 5 changed files: - .gitlab-ci.yml - + scripts/ci/deploy.py - + scripts/ci/sdist.py - appveyor.yml → win/ci/appveyor.yml - + win/ci/appveyor_build.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,14 +1,19 @@ image: ci-gajim:master -include: -- project: 'gajim/ci' - ref: master - file: '.gajim-ci.yml' +workflow: + rules: + - if: $GAJIM_NIGHTLY_BUILD + - if: $CI_PIPELINE_SOURCE == "push" + +stages: + - test + - build + - deploy pyright: stage: test script: - - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@$NBXMPP_BRANCH + - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - python3 -V @@ -16,8 +21,77 @@ pyright: - $(npm bin)/pyright --version - $(npm bin)/pyright interruptible: true - allow_failure: false -variables: - NBXMPP_BRANCH: master - PLUGINS_BRANCH: master +code-quality: + stage: test + script: + - python3 -V + - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git + - scripts/ci/pylint.sh --jobs=2 gajim + - coverage run --source=gajim -m unittest discover -s test -v + - coverage report -mi + - coverage xml -i + - codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim + - python3 setup.py build + - appstream-util validate build/data/org.gajim.Gajim.appdata.xml + coverage: "/TOTAL.+ ([0-9]{1,3}%)/" + artifacts: + reports: + cobertura: coverage.xml + interruptible: true + +build-linux: + stage: build + rules: + - if: '$GAJIM_NIGHTLY_BUILD' + - if: '$CI_COMMIT_TAG' + when: manual + script: + - python3 ./scripts/ci/sdist.py + + artifacts: + name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" + expire_in: 1 week + paths: + - dist/gajim-*.tar.gz + +build-windows: + stage: build + rules: + - if: '$GAJIM_NIGHTLY_BUILD' + - if: '$CI_COMMIT_TAG' + script: + - python3 ./win/ci/appveyor_build.py + + artifacts: + expire_in: 1 day + paths: + - build/Gajim-*.exe + +deploy-windows: + stage: deploy + needs: ['build-windows'] + rules: + - if: '$GAJIM_NIGHTLY_BUILD' + - if: '$CI_COMMIT_TAG' + when: manual + variables: + DEPLOY_TYPE: "windows" + script: + - python3 ./scripts/ci/deploy.py build + +deploy-flatpak: + stage: deploy + needs: [] + rules: + - if: '$CI_COMMIT_TAG' + when: manual + script: + - git clone https://github.com/flathub/org.gajim.Gajim.git + - cd org.gajim.Gajim + - git config user.email "ci(a)gajim.org" + - git config user.name "CI Deploy" + - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml + - git diff + - git add org.gajim.Gajim.yaml + - git commit -m "$CI_COMMIT_TAG" ===================================== scripts/ci/deploy.py ===================================== @@ -0,0 +1,97 @@ +import os +import sys +from ftplib import FTP_TLS, ftpcp +from pathlib import Path +import functools +from typing import Any + +from rich.console import Console + +FTP_URL = 'panoramix.gajim.org' +FTP_USER = os.environ['FTP_USER'] +FTP_PASS = os.environ['FTP_PASS'] + +WINDOWS_NIGHTLY_FOLDER = 'win_snap' + +console = Console() + + +def ftp_connection(func: Any) -> Any: + @functools.wraps(func) + def func_wrapper(filedir: Path) -> None: + ftp = FTP_TLS(FTP_URL, FTP_USER, FTP_PASS) + console.print('Successfully connected to', FTP_URL) + func(ftp, filedir) + ftp.quit() + console.print('Quit') + return + return func_wrapper + + +def get_release_folder_from_tag(tag: str) -> str: + numbers = tag.split('.') + return '.'.join(numbers[:2]) + + +def get_gajim_tag() -> str: + tag = os.environ.get('CI_COMMIT_TAG') + if tag is None: + exit('No tag found') + return tag.removesuffix('gajim-') + + +def get_dir_list(ftp: FTP_TLS) -> list[str]: + return [x[0] for x in ftp.mlsd()] + + +def ensure_folder_exists(ftp: FTP_TLS, dirname: str) -> None: + dir_list = get_dir_list(ftp) + if dirname not in dir_list: + ftp.mkd(dirname) + + +def upload_all_from_dir(ftp: FTP_TLS, dir: Path) -> None: + for file_path in dir.iterdir(): + console.print('Upload file', file_path.name) + with open(file_path, 'rb') as f: + ftp.storbinary('STOR ' + file_path.name, f) + + +def get_deploy_method() -> str: + deploy_type = os.environ['DEPLOY_TYPE'] + is_nightly = bool(os.environ.get('GAJIM_NIGHTLY_BUILD')) + if is_nightly: + return f'deploy_{deploy_type}_nightly' + return f'deploy_{deploy_type}_release' + + +@ftp_connection +def deploy_windows_nightly(ftp: FTP_TLS, filedir: Path) -> None: + ftp.cwd(WINDOWS_NIGHTLY_FOLDER) + upload_all_from_dir(ftp, filedir) + + +@ftp_connection +def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: + tag = get_gajim_tag() + folder = get_release_folder_from_tag(tag) + ensure_folder_exists(ftp, folder) + ftp.cwd(folder) + upload_all_from_dir(ftp, filedir) + + +@ftp_connection +def deploy_linux_nightly(): + raise NotImplementedError + + +@ftp_connection +def deploy_linux_release(): + raise NotImplementedError + + +if __name__ == '__main__': + filedir = Path(sys.argv[1]) + current_module = sys.modules[__name__] + method = getattr(current_module, get_deploy_method()) + method(filedir) ===================================== scripts/ci/sdist.py ===================================== @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 + +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') + + +def get_plugins_url(plugin): + return f'{PLUGINS_BASE_URL}/plugins_master_zip/{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() ===================================== appveyor.yml → win/ci/appveyor.yml ===================================== @@ -1,59 +1,57 @@ -image: Visual Studio 2019 - -environment: - matrix: - - MSYSTEM: MINGW64 - MSYS_ARCH: "x86_64" - ARCH: "64bit" - - - MSYSTEM: MINGW32 - MSYS_ARCH: "i686" - ARCH: "32bit" - -branches: - only: - - master - -clone_depth: 1 - -# init: -# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -install: - - set PATH=C:\msys64\usr\bin;%PATH% - - bash -lc "pacman --needed --noconfirm -Syu" - # This is needed because without killing all processes -Su will fail - - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process - - bash -lc "pacman -Sydd --noconfirm filesystem" - - bash -lc "pacman --needed --noconfirm -Su" - -build_script: - - - ps: | - $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() - $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" - - function bash($command) { - Write-Host $command -NoNewline - C:\msys64\usr\bin\sh.exe --login -c $command - } - - bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" - bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:ARCH)-$($env:TIME_STRING).exe" - -# on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -deploy: - # FTP deployment provider settings - - provider: FTP - protocol: ftp - host: panoramix.gajim.org - username: - secure: SNcOJDhUtBjfddbKXudE2w== - password: - secure: tQkYbcUb6nChCp0cdqo4CA== - folder: win_snap - debug: true +version: 1.1.{build} + +image: Visual Studio 2019 + +environment: + matrix: + - MSYSTEM: MINGW64 + MSYS_ARCH: "x86_64" + ARCH: "64bit" + + - MSYSTEM: MINGW32 + MSYS_ARCH: "i686" + ARCH: "32bit" + +branches: + only: + - master + +clone_depth: 1 + +# init: +# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + +install: + - set PATH=C:\msys64\usr\bin;%PATH% + - bash -lc "pacman --needed --noconfirm -Syu" + # This is needed because without killing all processes -Su will fail + - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process + - bash -lc "pacman -Sydd --noconfirm filesystem" + - bash -lc "pacman --needed --noconfirm -Su" + +build_script: + + - ps: | + $filename = "Gajim-$($env:GAJIM_VERSION)-$($env:ARCH)" + $filename_portable = "Gajim-$($env:GAJIM_VERSION)-Portable-$($env:ARCH)" + + if ($env:GAJIM_VERSION -eq "Nightly") { + $time_string=(get-date -UFormat "%Y-%m-%d").ToString() + $filename = $filename + "-" + $time_string + $filename_portable = $filename_portable + "-" + $time_string + } + + $buildroot="C:\msys64\home\appveyor\gajim\win\_build_root" + + function bash($command) { + Write-Host $command -NoNewline + C:\msys64\usr\bin\sh.exe --login -c $command + } + + bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" + bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" + Push-AppveyorArtifact "$($buildroot)/Gajim.exe" -FileName "$($filename).exe" + Push-AppveyorArtifact "$($buildroot)/Gajim-Portable.exe" -FileName "$($filename_portable).exe" + +# on_finish: +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== win/ci/appveyor_build.py ===================================== @@ -0,0 +1,116 @@ +#!/usr/bin/env python3 + +from typing import Iterator + +import os +import requests +import time +from pathlib import Path + +from rich.console import Console + +ACCOUNT = 'lovetox' +PROJECT_SLUG = 'gajim' +BRANCH = 'master' +BASE_URL = 'https://ci.appveyor.com/api' +API_KEY = os.environ['APPVEYOR_API_KEY'] +HEADERS = {'Authorization': f'Bearer {API_KEY}'} +RETRY_TIMEOUT = 2 * 60 +INITIAL_START_DELAY = 20 * 60 + +SETTINGS_API_URL = f'{BASE_URL}/projects/{ACCOUNT}/{PROJECT_SLUG}/settings/yaml' +BUILDS_API_URL = f'{BASE_URL}/builds' +PROJECT_API_URL = f'{BASE_URL}/projects/{ACCOUNT}/{PROJECT_SLUG}' + + +console = Console() + + +def get_gajim_version() -> str: + if os.environ.get('GAJIM_NIGHTLY_BUILD') is not None: + return 'Nightly' + + tag = os.environ.get('CI_COMMIT_TAG') + if tag is None: + exit('No tag found') + return tag.removesuffix('gajim-') + + +def push_yaml_to_project() -> None: + console.print('Push settings ...') + with open('./win/ci/appveyor.yml', 'r') as file: + yaml = file.read() + + req = requests.put(SETTINGS_API_URL, data=yaml, headers=HEADERS) + req.raise_for_status() + + +def start_build() -> str: + console.print('Start build ...') + payload = { + 'accountName': ACCOUNT, + 'projectSlug': PROJECT_SLUG, + 'branch': BRANCH, + 'environmentVariables': { + 'GAJIM_VERSION': get_gajim_version(), + } + } + req = requests.post(BUILDS_API_URL, headers=HEADERS, json=payload) + req.raise_for_status() + response = req.json() + return response['buildId'] + + +def is_build_finished(build: dict[str, str]) -> bool: + if build['status'] in ('failed', 'cancelled'): + exit('Found failed job') + + return build['status'] == 'success' + + +def get_artifacts(build_id: str) -> None: + time.sleep(INITIAL_START_DELAY) + while True: + time.sleep(RETRY_TIMEOUT) + + console.print('Check build status ...') + req = requests.get(PROJECT_API_URL, headers=HEADERS) + req.raise_for_status() + response = req.json() + build = response['build'] + if build_id != build['buildId']: + exit('Unable to find buildid: %s' % build_id) + + if is_build_finished(build): + break + + console.print('Build status:', build['status']) + + for job in build['jobs']: + download_job_artifacts(job['jobId']) + + console.print('All artifacts downloaded!') + + +def download_job_artifacts(job_id: str) -> None: + artifacts_api_url = f'{BASE_URL}/buildjobs/{job_id}/artifacts' + req = requests.get(artifacts_api_url, headers=HEADERS) + req.raise_for_status() + response = req.json() + + build_folder = Path.cwd() / 'build' + + for artifact in response: + filename = artifact['fileName'] + console.print('Download', filename, '...') + file_url = f'{artifacts_api_url}/{filename}' + req = requests.get(file_url, headers=HEADERS) + req.raise_for_status() + with open(build_folder / filename, 'wb') as file: + file.write(req.content) + + +if __name__ == '__main__': + push_yaml_to_project() + build_id = start_build() + get_artifacts(build_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e09c2c82366a286942b2b023d7edcc04… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e09c2c82366a286942b2b023d7edcc04… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Disable CI
by Philipp Hörist (＠lovetox) 26 Mar '22

26 Mar '22

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 832aa920 by lovetox at 2022-03-26T19:27:14+01:00 Disable CI - - - - - 1 changed file: - − .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml deleted ===================================== @@ -1,10 +0,0 @@ -image: ci-gajim:1.3 - -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/832aa920e9b4f7585c1de5aa8b29cb66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/832aa920e9b4f7585c1de5aa8b29cb66… 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