Skip to content

Commit eb76e2f

Browse files
authored
Fixing issue 2602 (#2604)
* fix #2302 test fails for pgr_stoerWagner * PostgreSQL 11 is no longer supported * Fixing test * Updating boost versions to test
1 parent 915afd5 commit eb76e2f

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/boost_version.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ name: Boost supported versions
1818
# Currently
1919
# - boost::geometry has not changed anything we use
2020
#
21-
# - boost::graph changed on 1.80
22-
# - boost::graph 1.75 requires C++14
23-
# - boost::graph changed on 1.68
24-
# - 1.56 is the minimum version we ask
21+
# boost::graph
22+
# - 1.84 is failing its own tests (Jul 2022)
23+
# - 1.80 changed on 1.80 (Aug 2022)
24+
# - 1.75 requires C++14 (Dec 2020)
25+
# - 1.68 changed on 1.68 (Aug 2018)
26+
# - 1.56 is the minimum version we ask (Aug 2014)
2527

2628
on:
2729
push:
@@ -65,7 +67,7 @@ jobs:
6567
strategy:
6668
fail-fast: false
6769
matrix:
68-
boost_minor: [56, 68, 75]
70+
boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 84]
6971

7072
steps:
7173
- uses: actions/checkout@v4

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
psql: [11,12,13,14,15,16]
32+
psql: [12,13,14,15,16]
3333
postgis: [3]
3434
os: [ubuntu-latest, ubuntu-20.04]
3535

pgtap/mincut/stoerWagner/compare_components.pg

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ SELECT * FROM pgr_stoerWagner(
8585
)
8686
$$
8787
);
88+
SELECT set_eq('stoerWagner5', 'stoerWagner6', '5: Mincut of edge 17');
8889

8990
PREPARE stoerWagner7 AS
9091
SELECT *
@@ -93,8 +94,11 @@ FROM pgr_stoerWagner(
9394
FROM edges WHERE id < 17 ORDER BY id'
9495
);
9596

96-
SELECT set_eq('stoerWagner5', 'stoerWagner6', '5: Mincut of edge 17');
97-
SELECT set_eq('stoerWagner7', 'VALUES (1, 1, 1, 1)', '6: Compare the mincut of subgraph with actual result');
97+
SELECT CASE WHEN (SELECT boost FROM pgr_full_version()) < '1.80' THEN
98+
collect_tap(set_eq('stoerWagner7', 'VALUES (1, 1, 1, 1)', '6: Compare the mincut of subgraph with actual result'))
99+
ELSE
100+
collect_tap(set_eq('stoerWagner7', 'VALUES (1, 14, 1, 1)', '6: Compare the mincut of subgraph with actual result'))
101+
END CASE;
98102

99103
SELECT * FROM finish();
100104
ROLLBACK;

0 commit comments

Comments
 (0)