From 30a89bf19fead453b21d358f043110a6929021dc Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:19:26 +0000 Subject: [PATCH 1/7] kvlist: make lookups case-insensitive Signed-off-by: Patrick Stephens --- src/cfl_kvlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfl_kvlist.c b/src/cfl_kvlist.c index 12c7711..4ffc5ea 100644 --- a/src/cfl_kvlist.c +++ b/src/cfl_kvlist.c @@ -329,7 +329,7 @@ struct cfl_variant *cfl_kvlist_fetch_s(struct cfl_kvlist *list, char *key, size_ continue; } - if (strncmp(pair->key, key, key_size) == 0) { + if (strncasecmp(pair->key, key, key_size) == 0) { return pair->val; } } From cacdb9f427a52925e112c93f63f49f7198856e29 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:24:52 +0000 Subject: [PATCH 2/7] workflows: update to latest versions Signed-off-by: Patrick Stephens --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 372c317..5610bda 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -108,10 +108,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build on ${{ matrix.os }} with ${{ matrix.compiler }} - uses: uraimo/run-on-arch-action@v2.5.0 + uses: uraimo/run-on-arch-action@v2.8.1 with: arch: aarch64 - distro: ubuntu20.04 + distro: ubuntu24.04 run: | apt-get update && \ apt-get install -y --no-install-recommends \ From 7610fe9f447de5223a45e8a5ed5258ce8e6c33b3 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:26:46 +0000 Subject: [PATCH 3/7] workflows: update to latest versions Signed-off-by: Patrick Stephens --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5610bda..8fee3b6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -111,14 +111,14 @@ jobs: uses: uraimo/run-on-arch-action@v2.8.1 with: arch: aarch64 - distro: ubuntu24.04 + distro: ubuntu-latest run: | apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ cmake \ file \ - make + make export CC=${{ env.compiler }} cmake -DCFL_TESTS=On . make all From 0ab6ea69f4e6b39f7f483eaae69bffe93327e5c5 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:28:31 +0000 Subject: [PATCH 4/7] workflows: update to latest versions Signed-off-by: Patrick Stephens --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8fee3b6..e8cb068 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -111,7 +111,7 @@ jobs: uses: uraimo/run-on-arch-action@v2.8.1 with: arch: aarch64 - distro: ubuntu-latest + distro: ubuntu_latest run: | apt-get update && \ apt-get install -y --no-install-recommends \ From 22b9190b0e4961308958655f45234a54f5dec6fe Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:31:37 +0000 Subject: [PATCH 5/7] workflows: fix centos 7 checkout Signed-off-by: Patrick Stephens --- .github/workflows/build.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e8cb068..923cd8e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -72,12 +72,24 @@ jobs: yum install -y cmake3 shell: bash - - uses: actions/checkout@v4 + - name: Clone repo without submodules (1.8.3 version of Git) + run: | + git clone https://github.com/fluent/cfl.git + shell: bash + + - name: Check out the branch (1.8.3 version of Git) + env: + BRANCH_NAME: ${{ github.head_ref }} + run: | + git checkout "$BRANCH_NAME" + shell: bash + working-directory: cfl - name: Run compilation run: | cmake3 -DCFL_DEV=on . make + working-directory: cfl/build build-debian: name: Debian Buster build to confirm no issues once used downstream From 88421cbeb614cf3530d7790b0931c70a7d86a019 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:31:59 +0000 Subject: [PATCH 6/7] workflows: fix centos 7 checkout Signed-off-by: Patrick Stephens --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 923cd8e..bafa6b8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,7 +89,7 @@ jobs: run: | cmake3 -DCFL_DEV=on . make - working-directory: cfl/build + working-directory: cfl build-debian: name: Debian Buster build to confirm no issues once used downstream From 10a7e561e0d3f4dd6f8b2a9443f40a1c55399bd3 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:34:32 +0000 Subject: [PATCH 7/7] workflows: fix centos 7 checkout Signed-off-by: Patrick Stephens --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bafa6b8..dbe9d44 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,7 +67,7 @@ jobs: sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo yum -y update - yum install -y ca-certificates cmake gcc gcc-c++ make wget + yum install -y ca-certificates cmake gcc gcc-c++ git make wget yum install -y epel-release yum install -y cmake3 shell: bash