From 01e12646a646f2e1ab3653de66e19299758b6fa0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 3 Jun 2020 22:07:07 +0200
Subject: [PATCH] Squashed 'shared/c-rbtree/' changes from
 b46392d25de7..7624b79b26d0

7624b79b26d0 ci: switch to c-util automation
c8cf17527845 ci: run additional CI with ptrace
7069619bc3a5 ci: switch to github-actions
fa97402c3faa ci: drop broken armv7hl
4d48f58a3c31 build: update submodules

git-subtree-dir: shared/c-rbtree
git-subtree-split: 7624b79b26d020a796fe7c624a4f2d3340f3d66b
---
 .cherryci/ci-test        | 12 ------------
 .cherryci/matrix         |  6 ------
 .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++
 .travis.yml              | 21 ---------------------
 subprojects/c-stdaux     |  2 +-
 5 files changed, 34 insertions(+), 40 deletions(-)
 delete mode 100755 .cherryci/ci-test
 delete mode 100755 .cherryci/matrix
 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 78b0423f6b..0000000000
--- 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}
-CRBTREE_TEST_PTRACE=1 ${CHERRY_LIB_MESONTEST}
-(( ! CHERRY_LIB_VALGRIND )) || ${CHERRY_LIB_MESONTEST} "--wrapper=${CHERRY_LIB_VALGRINDWRAP}"
diff --git a/.cherryci/matrix b/.cherryci/matrix
deleted file mode 100755
index 6cb6f71ebb..0000000000
--- a/.cherryci/matrix
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-
-_CHERRY_LIB_M_GCC_NDEBUG=("CC=gcc" "CFLAGS='${CHERRY_LIB_CFLAGS[*]} ${CHERRY_LIB_CFLAGS_GCC[*]} -O2 -DNDEBUG'")
-CHERRY_MATRIX+=("export ${_CHERRY_LIB_M_GCC_NDEBUG[*]}")
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..c270c52ca7
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,33 @@
+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
+
+  ci-ptrace:
+    name: Reduced CI with PTrace
+    runs-on: ubuntu-latest
+    env:
+      CRBTREE_TEST_PTRACE: '1'
+
+    steps:
+    - name: Fetch Sources
+      uses: actions/checkout@v2
+    - name: Run through C-Util CI
+      uses: c-util/automation/src/ci-c-util@v1
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 99a7bb9461..0000000000
--- 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 1bcec740f7..11930d2592 160000
--- a/subprojects/c-stdaux
+++ b/subprojects/c-stdaux
@@ -1 +1 @@
-Subproject commit 1bcec740f7ee1d2e71f84ac574f70fb4ec30539c
+Subproject commit 11930d259212605a15430523472ef54e0c7654ee