Merge #349

349: Add Fedora 28, Ubuntu 18.04 to CI and drop Linode support r=Saviq,AlanGriffiths a=AlanGriffiths Co-authored-by: Michał Sawicz <michal@sawicz.net> Co-authored-by: Alan Griffiths <alan@octopull.co.uk>
canonical · Apr 30, 2018 · aadc890 · aadc890
2 parents e510bc2 + 5fc2d72
commit aadc890
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,8 +26,6 @@ stages:
 
 env:
   global:
-    # SPREAD_LINODE_KEY
-  - secure: RCoJlG7Su7btAQDHoqDDkIGj3pXatGPeUnBQ3ZC2nfw40Tg7m3Rp21igW02x4hjWH7BtHM7AzyyAbr7Z87MA1KYVZ6bc1+LXjByiKWH+rurXchJupWusplZR1/6kbPMsOswH9bPf72FzfoG+Kt7Xg+14ePu34x0lvLHqIPQ40BdQVWWtonb9Af5IFpHz+6WU8wHxgjhaY84l2mlwIxu/IAqjxwvuMNrfHcoIdmwcITxZh1Dun8ckWTL8XDCxL4EHwhXj5tEOR51zE3wnvfNT1OfavtnIOpa35gx4oqpvb6748bPDbT1KScSrItsXRDelwZn5qAC/9oZwGZpF41F+uMPwty/X/P6AqWYz2UW/hoNIymFkcoU8HUkI2OtmlKW76bkJ+KHR+MW3uwOVQtZYkEolH/RYLlmMCJ2RhfD7MsKrrqOsOI7ROrMVp7bBzHkGT50vYi8hDGYRnb9jMgmHVuFejwQiFSFxOvN5aGo6dnmKV6fGXiTq3yUWSfwdC0/1K6OqT0giLByWLduLtEJSBIUWk8cWSIsx6CPh/TVrM3DPG7R1p6yuPyu9O13tRHYlLpGJOXbq6/eTLp6y9Jyh5f/mN3P1ydNfKH8iG1Sjj8pJbK2JAQ3zCnstHGpzFgjWncFqc1DuFIv/gJRact5fA7MnwjZMaexxhInq+4Thbl8=
     # SPREAD_GOOGLE_KEY
   - secure: C+R+J6LFdpge/aRDiCSVmU+Ps4sA0BhibQZgHi2iy20QkuD3NFiKcU7mISiEfWzsrRyLxtxYadWrfXXovyaSKDkIzuArVi/l5PyYRlLh7DYM/chk0CEbcoBpRKllgH57wU8ki7mCvksIbMdjZZo8iFIL79JUMaMvCK/QOwjqvj7d0I0qsJRT228G3n1KXKgRRL/9cafnjnzjHorrPpVJAkg8T7/QLO7uh7D5L5+KcHcf2Ws2/V05lhFXApCxL2QPLTCjn7cONKCaRfg35MkeFxWwTNm+JhGEW70A8Uk3qFWObWMPDEGrLkS5RF1Gw4zXrlqOyZRtK6VCaqsnJPVhqhLXliq9jNd/dbr/6L7hSa/t8ewbkXFuOqJzq240bEn4OCUFJOl9mwhklj14/Y+/xV3wRxIF6qdCDB99nirJKtwPjeYsKdCHLwKN/kj6yHhAU9JBDm+D5Odo9ny33eFPfQ+6SyGHL6BZKg7sVi8wbZwiTjmoN3wFZwSVto/4w1JiUHhJkMkEeIOlsQyfzJZl1DOTQDl4UiEAa8lhjvfqz8TqdXdu/3UPC9tokjnm45Joa5WkcnnvVsBoro+mSar6DipC6nb/+5yuguIEzcGha8iNyNMpMY0Ei0V+PwCl+M5k/vFtdA+HbSGs6VI4JvRd9awQ7geohn5ram5l4as67Sg=
   - DEBFULLNAME="Mir CI Bot"
@@ -38,12 +36,15 @@ env:
   - SYSTEM=google:fedora-rawhide-64 VARIANT=amd64
   - SYSTEM=google:ubuntu-16.04-64 VARIANT=amd64
   - SYSTEM=google:ubuntu-16.04-64 VARIANT=arm64
-  - SYSTEM=google:ubuntu-17.10-64 VARIANT=clang
+  - SYSTEM=google:ubuntu-17.10-64 VARIANT=amd64
+  - SYSTEM=google:ubuntu-18.04-64 VARIANT=clang
   - SYSTEM=google:fedora-27-64 VARIANT=amd64
+  - SYSTEM=google:fedora-28-64 VARIANT=amd64
 
 matrix:
   allow_failures:
-  - env: SYSTEM=linode:fedora-rawhide-64 VARIANT=amd64
+  - env: SYSTEM=google:fedora-28-64 VARIANT=amd64
+  - env: SYSTEM=google:fedora-rawhide-64 VARIANT=amd64
   - env: SYSTEM=google:ubuntu-devel-64 VARIANT=amd64
   fast_finish: true
 

diff --git a/spread.yaml b/spread.yaml
@@ -7,33 +7,23 @@ backends:
         systems:
             - ubuntu-16.04-64
             - ubuntu-17.10-64
-            - ubuntu-18.04-64:
-                image: ubuntu-daily:18.04/amd64
+            - ubuntu-18.04-64
             - fedora-27-64
+            - fedora-28-64
             - fedora-rawhide-64:
                 image: images:fedora/27/amd64
-    linode:
-        key: "$(HOST: echo $SPREAD_LINODE_KEY)"
-        plan: 8GB
-        location: fremont
-        systems:
-            - ubuntu-16.04-64
-            - ubuntu-17.10-64
-            - ubuntu-devel-64:
-                image: ubuntu-17.10/amd64
-            - fedora-27-64
-            - fedora-rawhide-64:
-                image: fedora-27-64
     google:
         key: "$(HOST: echo $SPREAD_GOOGLE_KEY)"
         plan: n1-highcpu-8
         location: computeengine/us-east1-b
         systems:
             - ubuntu-16.04-64
             - ubuntu-17.10-64
+            - ubuntu-18.04-64
             - ubuntu-devel-64:
                 image: ubuntu-17.10-64
             - fedora-27-64
+            - fedora-28-64
             - fedora-rawhide-64:
                 image: fedora-27-64
 

diff --git a/spread/build/fedora/task.yaml b/spread/build/fedora/task.yaml
@@ -1,5 +1,5 @@
 summary: Build (on Fedora)
-systems: [fedora-27-64, fedora-rawhide-64]
+systems: [fedora-*]
 
 execute: |
     if [ "${SPREAD_SYSTEM}" = "fedora-rawhide-64" -a "${SPREAD_REBOOT}" -eq 0 ]; then

diff --git a/spread/build/ubuntu/task.yaml b/spread/build/ubuntu/task.yaml
@@ -2,7 +2,7 @@ environment:
     DEB_BUILD_OPTIONS: "parallel=$( nproc ) noopt"
     NO_PKG_MANGLE: 1
 
-systems: [-fedora-27-64, -fedora-rawhide-64]
+systems: [ubuntu-*]
 
 summary: Build Ubuntu packages
 

diff --git a/src/server/frontend_wayland/xdg_shell_v6.cpp b/src/server/frontend_wayland/xdg_shell_v6.cpp
@@ -493,7 +493,7 @@ mf::XdgToplevelV6::XdgToplevelV6(struct wl_client* client, struct wl_resource* p
         });
 
     self->set_next_commit_action(
-        [resource = this->resource, self]
+        [resource = this->resource]
             {
                 wl_array states;
                 wl_array_init(&states);