summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-06-03 22:08:05 +0200
committerThomas Haller <thaller@redhat.com>2020-06-03 22:08:05 +0200
commitf9641b6b47cb615d8811dee7795793207d02e7d5 (patch)
tree3ebf183e015c7e85312c6d365445326e6e52fa40
parenta75d7de78b3cbe8f79fddd6eb6fb7f3d18d2791c (diff)
parent01e12646a646f2e1ab3653de66e19299758b6fa0 (diff)
downloadNetworkManager-f9641b6b47cb615d8811dee7795793207d02e7d5.tar.gz
shared/c-rbtree: reimport
git subtree pull --prefix shared/c-rbtree git@github.com:c-util/c-rbtree.git master --squash
-rwxr-xr-xshared/c-rbtree/.cherryci/ci-test12
-rwxr-xr-xshared/c-rbtree/.cherryci/matrix6
-rw-r--r--shared/c-rbtree/.github/workflows/ci.yml33
-rw-r--r--shared/c-rbtree/.travis.yml21
-rw-r--r--shared/c-rbtree/meson.build2
-rw-r--r--shared/c-rbtree/src/meson.build2
m---------shared/c-rbtree/subprojects/c-stdaux0
7 files changed, 33 insertions, 43 deletions
diff --git a/shared/c-rbtree/.cherryci/ci-test b/shared/c-rbtree/.cherryci/ci-test
deleted file mode 100755
index 78b0423f6b..0000000000
--- a/shared/c-rbtree/.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/shared/c-rbtree/.cherryci/matrix b/shared/c-rbtree/.cherryci/matrix
deleted file mode 100755
index 6cb6f71ebb..0000000000
--- a/shared/c-rbtree/.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/shared/c-rbtree/.github/workflows/ci.yml b/shared/c-rbtree/.github/workflows/ci.yml
new file mode 100644
index 0000000000..c270c52ca7
--- /dev/null
+++ b/shared/c-rbtree/.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/shared/c-rbtree/.travis.yml b/shared/c-rbtree/.travis.yml
deleted file mode 100644
index 99a7bb9461..0000000000
--- a/shared/c-rbtree/.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/shared/c-rbtree/meson.build b/shared/c-rbtree/meson.build
index d0277c989d..c131946762 100644
--- a/shared/c-rbtree/meson.build
+++ b/shared/c-rbtree/meson.build
@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
project(
'c-rbtree',
'c',
diff --git a/shared/c-rbtree/src/meson.build b/shared/c-rbtree/src/meson.build
index a16e899f41..d0b4d63ce9 100644
--- a/shared/c-rbtree/src/meson.build
+++ b/shared/c-rbtree/src/meson.build
@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
#
# target: libcrbtree.so
#
diff --git a/shared/c-rbtree/subprojects/c-stdaux b/shared/c-rbtree/subprojects/c-stdaux
-Subproject 1bcec740f7ee1d2e71f84ac574f70fb4ec30539
+Subproject 11930d259212605a15430523472ef54e0c7654e