[meld/flatpak-ci: 17/17] Merge branch 'master' into flatpak-ci
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/flatpak-ci: 17/17] Merge branch 'master' into flatpak-ci
- Date: Sat, 5 Oct 2019 22:57:22 +0000 (UTC)
commit 8826ea55229d622c9c35cc0d94bf21d5fba5ad95
Merge: 19b17f85 78612040
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Oct 6 08:55:47 2019 +1000
Merge branch 'master' into flatpak-ci
.gitlab-ci.yml | 6 +++---
.pre-commit-config.yaml | 38 ++++++++++++++++++++++++++++++++++++++
dev-requirements.txt | 3 ++-
gettext/its/mime.its | 1 -
gettext/its/mime.loc | 1 -
help/C/buildwebhelp.py | 1 -
help/C/file-filters.page | 2 --
help/C/flattened-view.page | 2 --
help/C/keyboard-shortcuts.page | 1 -
help/LINGUAS | 2 +-
maint | 4 ++--
meld/actiongutter.py | 5 +----
meld/chunkmap.py | 4 +---
meld/diffgrid.py | 4 +---
meld/dirdiff.py | 14 ++++++--------
meld/filediff.py | 25 ++++++++++++++-----------
meld/gutterrendererchunk.py | 4 +---
meld/iohelpers.py | 4 +---
meld/linkmap.py | 4 +---
meld/matchers/diffutil.py | 7 +++++--
meld/matchers/helpers.py | 1 -
meld/matchers/merge.py | 5 ++---
meld/meldapp.py | 5 +----
meld/meldbuffer.py | 5 +----
meld/melddoc.py | 6 +-----
meld/meldwindow.py | 7 ++-----
meld/misc.py | 5 ++---
meld/newdifftab.py | 5 +----
meld/patchdialog.py | 6 +-----
meld/preferences.py | 6 +-----
meld/recent.py | 4 +---
meld/resources/gtk/help-overlay.ui | 1 -
meld/settings.py | 5 +----
meld/sourceview.py | 8 +-------
meld/style.py | 11 +++--------
meld/tree.py | 28 ++++++++++++++++++++--------
meld/ui/bufferselectors.py | 4 +---
meld/ui/cellrenderers.py | 3 +--
meld/ui/emblemcellrenderer.py | 5 +----
meld/ui/filechooser.py | 4 +---
meld/ui/findbar.py | 4 +---
meld/ui/historyentry.py | 5 +----
meld/ui/notebook.py | 5 +----
meld/ui/notebooklabel.py | 4 +---
meld/ui/recentselector.py | 3 +--
meld/ui/statusbar.py | 8 ++------
meld/ui/util.py | 4 +---
meld/ui/vcdialogs.py | 5 +----
meld/undo.py | 1 -
meld/vc/_vc.py | 3 +--
meld/vc/cvs.py | 1 -
meld/vc/git.py | 1 -
meld/vcview.py | 7 +------
meld/windowstate.py | 1 -
meson_post_install.py | 2 +-
po/dz.po | 1 -
po/en_CA.po | 4 ++--
po/fr.po | 4 ++--
po/ko.po | 4 ++--
po/ne.po | 1 -
po/pa.po | 1 -
po/uk.po | 1 -
setup.cfg | 20 +++++++++++++++++---
test/conftest.py | 2 +-
test/test_buffer_lines.py | 1 -
test/test_matchers.py | 16 +++++++---------
test/test_misc.py | 1 +
67 files changed, 163 insertions(+), 203 deletions(-)
---
diff --cc .gitlab-ci.yml
index 58c375cf,9256c93d..efcf45bb
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -4,47 -2,45 +4,47 @@@ image: registry.gitlab.gnome.org/gnome/
stages:
- check
- - build
+ - test
+ - deploy
+ - build-windows
variables:
- DEPENDENCIES: python3
- python3-pip
- python3-pytest
- python3-gobject
- gobject-introspection
- gtk3
- gtksourceview4
- intltool
- glib2-devel
+ BUNDLE: "meld-dev.flatpak"
+ DEPENDENCIES: python3
+ python3-pip
+ python3-pytest
+ python3-gobject
+ gobject-introspection
+ gtk3
+ gtksourceview4
+ glib2-devel
-.linux-common: &linux-common
- before_script:
- - dnf update -y
- - dnf install -y $DEPENDENCIES
+flatpak:
+ variables:
+ MANIFEST_PATH: "data/org.gnome.MeldDevel.json"
+ MESON_ARGS: "-Dprofile=Devel"
+ FLATPAK_MODULE: "meld"
+ RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+ APP_ID: "org.gnome.Meld"
+ extends: .flatpak
- flake8:
+ lint:
stage: check
script:
+ - dnf install -y git
- pip3 install -r dev-requirements.txt
- - flake8 bin/meld meld/
- allow_failure: true
+ - pre-commit run --all-files --show-diff-on-failure
-linux-pytest:
+pytest:
stage: check
+ before_script:
+ - dnf update -y
+ - dnf install -y $DEPENDENCIES
script:
- py.test-3 test/
- <<: *linux-common
-
-linux-build:
- stage: build
- script:
- - python3 setup.py build
- <<: *linux-common
.mingw-common: &mingw-common
- stage: build
+ stage: build-windows
tags: # select gitlab runners with specific tag (unrelated to git repo tags)
- win32
artifacts:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]