From adea439ed23917e8feee3f08cd725b9b5896bc36 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 3 Jun 2020 22:09:14 +0200
Subject: [PATCH] Squashed 'shared/c-siphash/' changes from
 7c42c5925819..996b79578d94

996b79578d94 ci: switch to c-util automation
2d159c7da1d5 ci: switch to github-actions
191416c20ec1 ci: drop broken armv7hl
719b1b0138a2 build: update submodules

git-subtree-dir: shared/c-siphash
git-subtree-split: 996b79578d94a6569c42aae1bf806e63b8c6fa9a
---
 .cherryci/ci-test        | 12 ------------
 .github/workflows/ci.yml | 21 +++++++++++++++++++++
 .travis.yml              | 21 ---------------------
 subprojects/c-stdaux     |  2 +-
 4 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100755 .cherryci/ci-test
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.cherryci/ci-test b/.cherryci/ci-test
deleted file mode 100755
index 8ce5f5f70..000000000
--- a/.cherryci/ci-test
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-rm -Rf "./ci-build"
-mkdir "./ci-build"
-cd "./ci-build"
-
-${CHERRY_LIB_MESONSETUP} . "${CHERRY_LIB_SRCDIR}"
-${CHERRY_LIB_NINJABUILD}
-${CHERRY_LIB_MESONTEST}
-(( ! CHERRY_LIB_VALGRIND )) || ${CHERRY_LIB_MESONTEST} "--wrapper=${CHERRY_LIB_VALGRINDWRAP}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..b40abf690
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: Continuous Integration
+
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron:  '0 0 * * *'
+
+jobs:
+  ci:
+    name: CI with Default Configuration
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Fetch Sources
+      uses: actions/checkout@v2
+    - name: Run through C-Util CI
+      uses: c-util/automation/src/ci-c-util@v1
+      with:
+        m32: 1
+        valgrind: 1
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 99a7bb946..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-os: linux
-dist: trusty
-language: c
-
-services:
-  - docker
-
-before_install:
-  - curl -O -L "https://raw.githubusercontent.com/cherry-pick/cherry-images/v1/scripts/vmrun"
-  - curl -O -L "https://raw.githubusercontent.com/cherry-pick/cherry-ci/v1/scripts/cherryci"
-  - chmod +x "./vmrun" "./cherryci"
-
-jobs:
-  include:
-    - stage: test
-      script:
-        - ./vmrun -- ../src/cherryci -d ../src/.cherryci -s c-util -m
-    - script:
-        - ./vmrun -T armv7hl -- ../src/cherryci -d ../src/.cherryci -s c-util
-    - script:
-        - ./vmrun -T i686 -- ../src/cherryci -d ../src/.cherryci -s c-util
diff --git a/subprojects/c-stdaux b/subprojects/c-stdaux
index 1bcec740f..11930d259 160000
--- a/subprojects/c-stdaux
+++ b/subprojects/c-stdaux
@@ -1 +1 @@
-Subproject commit 1bcec740f7ee1d2e71f84ac574f70fb4ec30539c
+Subproject commit 11930d259212605a15430523472ef54e0c7654ee