From c3457de28a37d074a960cd464445de02d6527997 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 22 Oct 2017 10:45:11 -0400 Subject: Fix build yml files --- .travis.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3eeb1682..be7ac3e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,17 @@ arch: - wlc-git - libcap script: - - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." - - "make" + - git clone https://github.com/swaywm/wlroots + - cd wlroots + - mkdir build + - cd build + - meson --prefix=/usr .. + - sudo ninja install + - cd ../.. + - cmake . + - make + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . + - make script: - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" -- cgit v1.2.3 From 7414d9232751d378ff2840b7fb45e711b7f69477 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 22 Oct 2017 10:49:26 -0400 Subject: Also need meson --- .build.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.build.yml b/.build.yml index 5fa8eb41..3717d699 100644 --- a/.build.yml +++ b/.build.yml @@ -10,6 +10,7 @@ packages: - cairo - wayland - gdk-pixbuf2 + - meson sources: - https://git.sr.ht/~sircmpwn/sway - https://git.sr.ht/~sircmpwn/wlroots diff --git a/.travis.yml b/.travis.yml index be7ac3e0..bc1ee45b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ arch: - gdk-pixbuf2 - wlc-git - libcap + - meson script: - git clone https://github.com/swaywm/wlroots - cd wlroots -- cgit v1.2.3 From 3546412fc9fb9a51b4316070eff4991c14594127 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 1 Dec 2017 05:43:08 -0500 Subject: update travis --- .build.yml | 21 +++++++++------------ .travis.yml | 26 ++++++++++---------------- 2 files changed, 19 insertions(+), 28 deletions(-) (limited to '.travis.yml') diff --git a/.build.yml b/.build.yml index 3717d699..a2f855e9 100644 --- a/.build.yml +++ b/.build.yml @@ -1,7 +1,7 @@ # vim: ft=yaml ts=2 sw=2 et : image: archlinux packages: - - cmake + - meson - wlc-git - xorg-server-xwayland - xcb-util-image @@ -9,25 +9,22 @@ packages: - pango - cairo - wayland + - wayland-protocols - gdk-pixbuf2 - - meson + - libinput + - libxkbcommon sources: - https://git.sr.ht/~sircmpwn/sway - https://git.sr.ht/~sircmpwn/wlroots tasks: - wlroots: | cd wlroots - mkdir build - cd build - meson --prefix=/usr .. - ninja - sudo ninja install + meson --prefix=/usr build + ninja -C build + sudo ninja -C build install - setup: | cd sway - mkdir build - cd build - cmake .. + meson build - build: | cd sway - cd build - make + ninja -C build diff --git a/.travis.yml b/.travis.yml index bc1ee45b..db717718 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,35 +7,29 @@ compiler: - clang env: - - BUILD_TYPE=Release - - BUILD_TYPE=Debug - - BUILD_TYPE=ASAN + - BUILD_TYPE=release + - BUILD_TYPE=debug arch: packages: - - cmake + - meson + - ninja - xorg-server-xwayland - json-c - wayland + - wayland-protocols - xcb-util-image - pango - cairo - gdk-pixbuf2 - - wlc-git - libcap - - meson + - libinput + - libxkbcommon script: - git clone https://github.com/swaywm/wlroots - - cd wlroots - - mkdir build - - cd build - - meson --prefix=/usr .. - - sudo ninja install - - cd ../.. - - cmake . - - make - - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . - - make + - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install' + - meson build --buildtype=$BUILD_TYPE + - ninja -C build script: - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" -- cgit v1.2.3 From 659ee8639430b77da6d00f518494b9c86c2745ff Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 4 Mar 2018 16:37:48 -0500 Subject: Drop Travis in favor of builds.sr.ht --- .travis.yml | 35 ----------------------------------- README.de.md | 2 +- README.el.md | 2 +- README.fr.md | 2 +- README.it.md | 2 +- README.ja.md | 2 +- README.md | 2 +- README.pt.md | 2 +- README.ru.md | 2 +- README.uk.md | 2 +- 10 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 .travis.yml (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index db717718..00000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -sudo: required - -language: c - -compiler: - - gcc - - clang - -env: - - BUILD_TYPE=release - - BUILD_TYPE=debug - -arch: - packages: - - meson - - ninja - - xorg-server-xwayland - - json-c - - wayland - - wayland-protocols - - xcb-util-image - - pango - - cairo - - gdk-pixbuf2 - - libcap - - libinput - - libxkbcommon - script: - - git clone https://github.com/swaywm/wlroots - - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install' - - meson build --buildtype=$BUILD_TYPE - - ninja -C build - -script: - - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" diff --git a/README.de.md b/README.de.md index 47084ad3..dbef4ee6 100644 --- a/README.de.md +++ b/README.de.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Mit fosspay spenden](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway Der Fortschritt dieser Übersetzung kann [hier](https://github.com/swaywm/sway/issues/1318) eingesehen werden. diff --git a/README.el.md b/README.el.md index dd1889e4..8d8f0f3e 100644 --- a/README.el.md +++ b/README.el.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway "Ο Sway (**S**irCmpwn's **Way**land) είναι ένας **υπό ανάπτυξη** [Wayland](http://wayland.freedesktop.org/) διαχειριστής παραθύρων συμβατός με τον αντίστοιχο διαχειριστή παραθύρων i3 για τον X11. Διαβάστε τις [Συνήθεις Ερωτήσεις](https://github.com/swaywm/sway/wiki). Συνδεθείτε στο [κανάλι μας στο IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway στο diff --git a/README.fr.md b/README.fr.md index 5baee7a8..1ffcd478 100644 --- a/README.fr.md +++ b/README.fr.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway "**S**irCmpwn's **Way**land compositor" est un compositeur [Wayland](http://wayland.freedesktop.org/) compatible avec i3, **en cours de développement**. diff --git a/README.it.md b/README.it.md index af344405..ef5b81a7 100644 --- a/README.it.md +++ b/README.it.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway "**S**irCmpwn's **Way**land compositor" è un compositor [Wayland](http://wayland.freedesktop.org/) **in via di sviluppo** diff --git a/README.ja.md b/README.ja.md index cf89971c..aa420814 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway "**S**irCmpwn's **Way**land compositor"は**開発中**の i3互換な[Wayland](http://wayland.freedesktop.org/)コンポジタです。 diff --git a/README.md b/README.md index cfe51346..ae12ea89 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway [**English**](https://github.com/swaywm/sway/blob/master/README.md#sway--) - [日本語](https://github.com/swaywm/sway/blob/master/README.ja.md#sway--) - [Deutsch](https://github.com/swaywm/sway/blob/master/README.de.md#sway--) - [Ελληνικά](https://github.com/swaywm/sway/blob/master/README.el.md#sway--) - [Français](https://github.com/swaywm/sway/blob/master/README.fr.md#sway--) - [Українська](https://github.com/swaywm/sway/blob/master/README.uk.md#sway--) - [Italiano](https://github.com/swaywm/sway/blob/master/README.it.md#sway--) - [Português](https://github.com/swaywm/sway/blob/master/README.pt.md#sway--) - [Русский](https://github.com/swaywm/sway/blob/master/README.ru.md#sway--) diff --git a/README.pt.md b/README.pt.md index ff51ac2c..69c9538a 100644 --- a/README.pt.md +++ b/README.pt.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Doe através do fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway "**S**irCmpwn's **Way**land compositor" é um compositor [Wayland](http://wayland.freedesktop.org/) compatível com o i3. Leia o [FAQ](https://github.com/swaywm/sway/wiki). Participe do diff --git a/README.ru.md b/README.ru.md index 12890d2d..e1580c81 100644 --- a/README.ru.md +++ b/README.ru.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Пожертвовать через fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway "**S**irCmpwn's **Way**land compositor" на данный момент **(в разработке)** i3-совместимый [Wayland](http://wayland.freedesktop.org/) композитор. diff --git a/README.uk.md b/README.uk.md index 37a33e4c..71b35470 100644 --- a/README.uk.md +++ b/README.uk.md @@ -1,4 +1,4 @@ -# sway [![](https://api.travis-ci.org/swaywm/sway.svg)](https://travis-ci.org/swaywm/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4) +# sway **Sway** ("**S**irCmpwn's **Way**land compositor") це сумісний з i3 композитор [Wayland](http://wayland.freedesktop.org/) (**у стані розробки**). -- cgit v1.2.3