Skip to content

Commit 9fb3671

Browse files
committed
Merge branch 'master' into gh-pages
2 parents 4b2b49f + b3ed1f7 commit 9fb3671

5 files changed

Lines changed: 47 additions & 7 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,42 @@ jobs:
102102
env:
103103
CONFIG_FLAGS: --disable-silent-rules --enable-debug
104104

105+
ubuntu_25_10_gcc:
106+
strategy:
107+
matrix:
108+
version: [15]
109+
runs-on: ubuntu-24.04
110+
env:
111+
CPP: cpp-${{ matrix.version }}
112+
CC: gcc-${{ matrix.version }}
113+
CXX: g++-${{ matrix.version }}
114+
steps:
115+
- name: "Checkout libcdada"
116+
uses: actions/checkout@v3
117+
with:
118+
path: libcdada
119+
120+
- name: Run tests in Ubuntu 25.10 container
121+
run: |
122+
docker run --rm \
123+
-v ${{ github.workspace }}:/workspace \
124+
-w /workspace \
125+
-e PPA_TOOLCHAIN_REPO="false" \
126+
-e CPP="${CPP}" \
127+
-e CC="${CC}" \
128+
-e CXX="${CXX}" \
129+
-e CONFIG_FLAGS="--disable-silent-rules" \
130+
ubuntu:25.10 \
131+
bash -c "
132+
set -e
133+
apt-get update
134+
apt-get install -y git
135+
git config --global --add safe.directory /workspace/libcdada
136+
./libcdada/.github/workflows/deps.sh gcc ${{ matrix.version }}
137+
cd libcdada && .github/workflows/test_script.sh
138+
CONFIG_FLAGS=\"\$CONFIG_FLAGS --enable-debug\" .github/workflows/test_script.sh
139+
"
140+
105141
ubuntu_22_04_clang:
106142
strategy:
107143
matrix:

.github/workflows/deps.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ else
1212
fi
1313

1414
(sudo --help > /dev/null 2>&1 ) || (apt update && apt install -y sudo software-properties-common automake autoconf libtool make) #containers
15-
sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
15+
if [[ "${PPA_TOOLCHAIN_REPO}" != "false" ]]; then
16+
sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
17+
fi
1618
sudo apt-get update
1719
sudo apt-get install -y python3 valgrind $COMPILER

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Legend:
99
- [O] Other
1010
```
1111

12+
### v0.6.3 (28th January 2026)
13+
14+
- [O] tests/CI: fixed compilation with GCC 16 (thanks A. Stieger). Added CI coverage for GCC 15.
15+
1216
### v0.6.2 (24th October 2025)
1317

1418
- [B] map: fix garbage in `prev_val` when key not in map for `cdada_map_insert_replace()`
@@ -22,7 +26,7 @@ Legend:
2226
### v0.6.0 (17th April 2024)
2327

2428
- [+] !! BREAKING CHANGE !! Add `prev_val` to `cdada_map_insert_replace()` API call to make it more useful
25-
- [O] CI: add coverage for clang11, 12 and 13.
29+
- [O] CI: add coverage for clang11, 12 and 13
2630

2731
### v0.5.2 (7th November 2023)
2832

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.6.2
1+
v0.6.3

test/stack_test.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,7 @@ int _test_u552_push_pop(){
746746
TEST_ASSERT(rv == CDADA_SUCCESS);
747747
TEST_ASSERT(key.mid == 1);
748748

749-
int jj;
750-
for(jj = 0, i=0;i<5; ++i, jj += 1){
749+
for(i=0;i<5; ++i){
751750
key.mid = 0;
752751
rv = cdada_stack_push(stack, &key);
753752
TEST_ASSERT(rv == CDADA_SUCCESS);
@@ -906,8 +905,7 @@ int test_u3552_push_pop_custom(){
906905
TEST_ASSERT(rv == CDADA_SUCCESS);
907906
TEST_ASSERT(key.mid == 1);
908907

909-
int jj;
910-
for(jj = 0, i=0;i<5; ++i, jj += 1){
908+
for(i=0;i<5; ++i){
911909
key.mid = 0;
912910
rv = cdada_stack_push(stack, &key);
913911
TEST_ASSERT(rv == CDADA_SUCCESS);

0 commit comments

Comments
 (0)