summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-06-03 22:03:44 +0200
committerThomas Haller <thaller@redhat.com>2020-06-03 22:05:14 +0200
commita75d7de78b3cbe8f79fddd6eb6fb7f3d18d2791c (patch)
tree7325019b555650ccadade71666494b5c9d33918f
parent70c71151c6b331f7598a2b7276bcb0e43679c285 (diff)
parentbcf93a280066024694db0bab837fb06f58e6a069 (diff)
downloadNetworkManager-a75d7de78b3cbe8f79fddd6eb6fb7f3d18d2791c.tar.gz
shared/c-stdaux: reimport
git subtree pull --prefix shared/c-stdaux git@github.com:c-util/c-stdaux.git master --squash
-rwxr-xr-xshared/c-stdaux/.cherryci/ci-test12
-rw-r--r--shared/c-stdaux/.github/workflows/ci.yml21
-rw-r--r--shared/c-stdaux/.travis.yml21
-rw-r--r--shared/c-stdaux/meson.build2
-rw-r--r--shared/c-stdaux/src/meson.build2
5 files changed, 21 insertions, 37 deletions
diff --git a/shared/c-stdaux/.cherryci/ci-test b/shared/c-stdaux/.cherryci/ci-test
deleted file mode 100755
index 8ce5f5f70e..0000000000
--- a/shared/c-stdaux/.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/shared/c-stdaux/.github/workflows/ci.yml b/shared/c-stdaux/.github/workflows/ci.yml
new file mode 100644
index 0000000000..b40abf690f
--- /dev/null
+++ b/shared/c-stdaux/.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/shared/c-stdaux/.travis.yml b/shared/c-stdaux/.travis.yml
deleted file mode 100644
index 99a7bb9461..0000000000
--- a/shared/c-stdaux/.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-stdaux/meson.build b/shared/c-stdaux/meson.build
index 6843e284d4..c8c5da536f 100644
--- a/shared/c-stdaux/meson.build
+++ b/shared/c-stdaux/meson.build
@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
project(
'c-stdaux',
'c',
diff --git a/shared/c-stdaux/src/meson.build b/shared/c-stdaux/src/meson.build
index 7b2e785604..f6db824d24 100644
--- a/shared/c-stdaux/src/meson.build
+++ b/shared/c-stdaux/src/meson.build
@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
#
# target: libcstdaux.so
# (No .so is built so far, since we are header-only. This might change in the