From f2a0107df65c857125c4be3b8bcc5aebee538ec3 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 16 Jan 2020 12:34:20 +0000
Subject: [PATCH 1/4] semaphore: introduce Semaphore v2

---
 .semaphore/semaphore.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .semaphore/semaphore.yml

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
new file mode 100644
index 00000000..1a419bd6
--- /dev/null
+++ b/.semaphore/semaphore.yml
@@ -0,0 +1,28 @@
+---
+# vi: sw=2 ts=2 et:
+
+version: v1.0
+name: casync
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+
+# Auto-cancel all running & queued jobs on force-push
+auto_cancel:
+  running:
+    when: "true"
+
+# Cancel all jobs on the first fail
+fail_fast:
+  cancel:
+    when: "true"
+
+blocks:
+  - name: amd64 & i386
+    task:
+      jobs:
+        - name: Build & run
+          commands:
+            - checkout
+            - test/semaphore-run

From 8bbd0761559d22bf4e35a87e789297cd25bdddba Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 16 Jan 2020 13:37:13 +0100
Subject: [PATCH 2/4] semaphore: drop the custom Python 3.6 PPA

Shouldn't be needed anymore, since the new Sempahore supports Ubuntu
Bionic
---
 test/semaphore-run | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/semaphore-run b/test/semaphore-run
index 51c971db..6bcc5c4d 100755
--- a/test/semaphore-run
+++ b/test/semaphore-run
@@ -19,11 +19,7 @@ set -eu
 (
     set -x
 
-    sudo rm /etc/apt/sources.list.d/*
-
     sudo apt install -y software-properties-common
-    sudo add-apt-repository -y ppa:jonathonf/python-3.6
-    sudo add-apt-repository -y ppa:ginggs/backports
     sudo apt -y update
     sudo apt -y --no-install-recommends install \
          python3.6 \

From cba6527a6caa549ac29c3a38e11d1222215568bd Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 16 Jan 2020 14:17:53 +0100
Subject: [PATCH 3/4] semaphore: install meson & ninja system-wide

---
 test/semaphore-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/semaphore-run b/test/semaphore-run
index 6bcc5c4d..c6381198 100755
--- a/test/semaphore-run
+++ b/test/semaphore-run
@@ -35,7 +35,7 @@ set -eu
          python3-wheel \
          python-sphinx \
          "${DEVPKGS[@]}"
-    python3.6 -m pip install --user meson ninja
+    sudo python3.6 -m pip install meson ninja
 )
 
 echo

From 70ce13019bdda33cd8d5686427746d05e06ebc2d Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 16 Jan 2020 14:52:19 +0100
Subject: [PATCH 4/4] semaphore: bump gcc from gcc5 to gcc7

---
 test/semaphore-run | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/semaphore-run b/test/semaphore-run
index c6381198..a1f31f4e 100755
--- a/test/semaphore-run
+++ b/test/semaphore-run
@@ -19,7 +19,7 @@ set -eu
 (
     set -x
 
-    sudo apt install -y software-properties-common
+    sudo apt install -y gcc-7 libgcc-7-dev software-properties-common
     sudo apt -y update
     sudo apt -y --no-install-recommends install \
          python3.6 \
@@ -71,7 +71,7 @@ echo "============= Installing i386 build dependencies =============="
     sudo apt remove -y libcurl4-openssl-dev
     sudo apt-get install -y --no-install-recommends \
          gcc-multilib \
-         libgcc-5-dev:i386 \
+         libgcc-7-dev:i386 \
          "${DEVPKGS[@]/%/:i386}"
 )
 
@@ -80,7 +80,7 @@ echo "============= Building i386 =============="
 (
     set -x
     export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu
-    CC=gcc-5 CFLAGS=-m32 LDFLAGS=-m32 meson build-i386
+    CC=gcc-7 CFLAGS=-m32 LDFLAGS=-m32 meson build-i386
     ninja -C build-i386
 )