diff options
author | Thomas Haller <thaller@redhat.com> | 2020-06-03 22:10:22 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-06-03 22:10:22 +0200 |
commit | fc11843fdcbfd72c96f82bca243aa3882faa0cef (patch) | |
tree | 504c77fd80098e0ff9528aa4e87ae0cfb1de4a93 | |
parent | f9641b6b47cb615d8811dee7795793207d02e7d5 (diff) | |
parent | adea439ed23917e8feee3f08cd725b9b5896bc36 (diff) | |
download | NetworkManager-fc11843fdcbfd72c96f82bca243aa3882faa0cef.tar.gz |
shared/c-siphash: reimport
git subtree pull --prefix shared/c-siphash git@github.com:c-util/c-siphash.git master --squash
-rwxr-xr-x | shared/c-siphash/.cherryci/ci-test | 12 | ||||
-rw-r--r-- | shared/c-siphash/.github/workflows/ci.yml | 21 | ||||
-rw-r--r-- | shared/c-siphash/.travis.yml | 21 | ||||
-rw-r--r-- | shared/c-siphash/meson.build | 2 | ||||
-rw-r--r-- | shared/c-siphash/src/meson.build | 2 | ||||
m--------- | shared/c-siphash/subprojects/c-stdaux | 0 |
6 files changed, 21 insertions, 37 deletions
diff --git a/shared/c-siphash/.cherryci/ci-test b/shared/c-siphash/.cherryci/ci-test deleted file mode 100755 index 8ce5f5f70e..0000000000 --- a/shared/c-siphash/.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-siphash/.github/workflows/ci.yml b/shared/c-siphash/.github/workflows/ci.yml new file mode 100644 index 0000000000..b40abf690f --- /dev/null +++ b/shared/c-siphash/.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-siphash/.travis.yml b/shared/c-siphash/.travis.yml deleted file mode 100644 index 99a7bb9461..0000000000 --- a/shared/c-siphash/.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-siphash/meson.build b/shared/c-siphash/meson.build index b90cde2a80..2b07b019b3 100644 --- a/shared/c-siphash/meson.build +++ b/shared/c-siphash/meson.build @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: LGPL-2.1+ - project( 'c-siphash', 'c', diff --git a/shared/c-siphash/src/meson.build b/shared/c-siphash/src/meson.build index 606b3763ed..7ee9c601e7 100644 --- a/shared/c-siphash/src/meson.build +++ b/shared/c-siphash/src/meson.build @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: LGPL-2.1+ - # # target: libcsiphash.so # diff --git a/shared/c-siphash/subprojects/c-stdaux b/shared/c-siphash/subprojects/c-stdaux -Subproject 1bcec740f7ee1d2e71f84ac574f70fb4ec30539 +Subproject 11930d259212605a15430523472ef54e0c7654e |