summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-05-06 09:46:16 +0200
committerThomas Haller <thaller@redhat.com>2022-05-06 09:46:16 +0200
commit1c260f5a961d6185aca74d6bde24b3a0ef1b82d3 (patch)
treebf77880b2d84205940420a9de5d0bdb65722f199
parente5b6639624894d5e4411caf4c40f527db86151ae (diff)
downloadNetworkManager-1c260f5a961d6185aca74d6bde24b3a0ef1b82d3.tar.gz
Squashed 'src/c-stdaux/' changes from f20e1cf2dfb1..99fe83cd5698
99fe83cd5698 build: update copyright 344b3ca8ce29 build: declare meson dependency 0e0982fd327e ci: use v1 of cabuild 9d2dafc4aaa4 ci: enable matrix-mode 822e358e60bb ci: switch to new C-Util CI 45b322aa6fb4 ci: try out new cabuild workflow git-subtree-dir: src/c-stdaux git-subtree-split: 99fe83cd5698b406f1cd991989551aac299f3d29
-rw-r--r--.github/workflows/ci.yml16
-rw-r--r--AUTHORS2
-rw-r--r--meson.build1
3 files changed, 8 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b40abf690f..d54b120011 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,13 +9,9 @@ on:
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
+ uses: bus1/cabuild/.github/workflows/ci-c-util.yml@v1
+ with:
+ cabuild_ref: "v1"
+ m32: true
+ matrixmode: true
+ valgrind: true
diff --git a/AUTHORS b/AUTHORS
index 6015c4f31c..555ecb5581 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,7 +30,7 @@ AUTHORS-LGPL:
along with this program; If not, see <http://www.gnu.org/licenses/>.
COPYRIGHT: (ordered alphabetically)
- Copyright (C) 2018-2019 Red Hat, Inc.
+ Copyright (C) 2018-2022 Red Hat, Inc.
AUTHORS: (ordered alphabetically)
David Rheinsberg <david.rheinsberg@gmail.com>
diff --git a/meson.build b/meson.build
index abc30255d2..3054e25073 100644
--- a/meson.build
+++ b/meson.build
@@ -5,6 +5,7 @@ project(
'c_std=c11'
],
license: 'Apache',
+ meson_version: '>=0.60.0',
version: '1.0.0',
)
major = meson.project_version().split('.')[0]