Skip to content

Commit b714ba3

Browse files
wifi:)wifi:)
authored andcommitted
Merge upstream/develop into minDegree-ordering-cleanup
Resolved merge conflicts in: - doc/_static/page_history.js: Combined page entries for both branches - doc/ordering/CMakeLists.txt: Added all ordering files - doc/ordering/ordering-family.rst: Fixed duplicates and added all functions - doc/ordering/pgr_kingOrdering.rst: Fixed formatting and rubric - doc/src/pgRouting-introduction.rst: Combined contributor lists - docqueries/ordering/CMakeLists.txt: Added all ordering query files - docqueries/ordering/test.conf: Added all test files, removed duplicates - include/drivers/ordering_driver.hpp: Combined developer credits - include/ordering/kingOrdering.hpp: Fixed header guard comment - sql/ordering/CMakeLists.txt: Added all SQL files - src/ordering/CMakeLists.txt: Added all source files For add/add conflicts, used upstream version for complete implementations: - include/process/ordering_process.h - pgtap/ordering/kingOrdering/edge_cases.pg - sql/ordering/_kingOrdering.sql - sql/ordering/kingOrdering.sql - src/ordering/kingOrdering.c - src/ordering/ordering_driver.cpp - src/ordering/ordering_process.cpp This merge combines the minDegree ordering work with the latest upstream changes including bandwidth and sloan ordering implementations.
2 parents 13048d9 + e822898 commit b714ba3

277 files changed

Lines changed: 4260 additions & 2089 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-tidy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Checks: >
22
google-*,
3-
-google-readability-braces-around-statements,
43
-google-readability-casting,
54
clang-analyzer-*,
65
clang-diagnostic-*,

.github/workflows/boost_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 83, 84, 86]
7474

7575
steps:
76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v5
7777

7878
- name: Get postgres version
7979
run: |

.github/workflows/centos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- centos-7 gcc-4.8.5
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636

3737
- name: get postgres version
3838
run: |

.github/workflows/check-files.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
- name: Signatures are not removed
2525
run: |
2626
tools/scripts/test_signatures.sh
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
- name: News file up to date
3434
run: |
3535
tools/release-scripts/notes2news.pl
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
4444
- name: Install Requirements
4545
run: |
4646
sudo apt install -y licensecheck
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Checkout
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v5
5555
- name: Install Requirements
5656
run: |
5757
sudo apt install -y shellcheck
@@ -62,9 +62,9 @@ jobs:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- name: Checkout
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666
- name: Install Requirements
67-
uses: actions/checkout@v4
67+
uses: actions/checkout@v5
6868
with:
6969
repository: 'cpplint/cpplint'
7070
ref: "develop"

.github/workflows/check-queries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fail-fast: false
5858

5959
steps:
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6161

6262
- name: get postgres version
6363
run: |

.github/workflows/clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
fail-fast: false
5555

5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858

5959
- name: Get postgres version
6060
run: |

.github/workflows/doc-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
language: [en,es,zh_Hans]
5656

5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v5
5959
with:
6060
fetch-depth: 2
6161

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
steps:
5252
- name: Checkout repository
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v5
5454

5555
- name: install deps
5656
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222
with:
2323
fetch-depth: 0
2424

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
os: [ubuntu-latest, ubuntu-22.04]
3535

3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838

3939
- name: 'Raise Priority for apt.postgresql.org'
4040
run: |

0 commit comments

Comments
 (0)