Skip to content

Commit

Permalink
Fixing issue 2602 (#2604)
Browse files Browse the repository at this point in the history
* fix #2302 test fails for pgr_stoerWagner
* PostgreSQL 11 is no longer supported
* Fixing test
* Updating boost versions to test
  • Loading branch information
cvvergara authored Jan 9, 2024
1 parent 915afd5 commit eb76e2f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/boost_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ name: Boost supported versions
# Currently
# - boost::geometry has not changed anything we use
#
# - boost::graph changed on 1.80
# - boost::graph 1.75 requires C++14
# - boost::graph changed on 1.68
# - 1.56 is the minimum version we ask
# boost::graph
# - 1.84 is failing its own tests (Jul 2022)
# - 1.80 changed on 1.80 (Aug 2022)
# - 1.75 requires C++14 (Dec 2020)
# - 1.68 changed on 1.68 (Aug 2018)
# - 1.56 is the minimum version we ask (Aug 2014)

on:
push:
Expand Down Expand Up @@ -65,7 +67,7 @@ jobs:
strategy:
fail-fast: false
matrix:
boost_minor: [56, 68, 75]
boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 84]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
psql: [11,12,13,14,15,16]
psql: [12,13,14,15,16]
postgis: [3]
os: [ubuntu-latest, ubuntu-20.04]

Expand Down
8 changes: 6 additions & 2 deletions pgtap/mincut/stoerWagner/compare_components.pg
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ SELECT * FROM pgr_stoerWagner(
)
$$
);
SELECT set_eq('stoerWagner5', 'stoerWagner6', '5: Mincut of edge 17');

PREPARE stoerWagner7 AS
SELECT *
Expand All @@ -93,8 +94,11 @@ FROM pgr_stoerWagner(
FROM edges WHERE id < 17 ORDER BY id'
);

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

SELECT * FROM finish();
ROLLBACK;

0 comments on commit eb76e2f

Please sign in to comment.