From f61b945ad4dd91f8febcb78c54389566eead0fd1 Mon Sep 17 00:00:00 2001 From: Zacharias Knudsen Date: Mon, 2 Oct 2023 09:35:15 +0200 Subject: [PATCH] Add CHANGELOG entry for #140 and add tests to verify --- .github/workflows/test-linux.yml | 4 ++++ .github/workflows/test-macos.yml | 2 +- CHANGELOG.md | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 4fb683e4..66382efc 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -11,7 +11,11 @@ jobs: strategy: matrix: config: [Release, Debug] +<<<<<<< HEAD pg: [16, 15, 14, 13] +======= + pg: [16, 15, 14, 13, 12, 11] +>>>>>>> 7fbe5bb (Add CHANGELOG entry for #140 and add tests to verify) runs-on: ubuntu-22.04 diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 79719b1b..960d8f84 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -12,7 +12,7 @@ jobs: matrix: config: [Release, Debug] - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index eec4d5f6..55603778 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -260,7 +260,11 @@ avoid adding features or APIs which do not map onto the [#112]: https://github.com/zachasme/h3-pg/pull/112 [#117]: https://github.com/zachasme/h3-pg/issues/117 [#131]: https://github.com/zachasme/h3-pg/pull/131 +<<<<<<< HEAD [#160]: https://github.com/zachasme/h3-pg/pull/160 +======= +[#140]: https://github.com/zachasme/h3-pg/pull/140 +>>>>>>> 7fbe5bb (Add CHANGELOG entry for #140 and add tests to verify) [@abelvm]: https://github.com/AbelVM [@kalenikaliaksandr]: https://github.com/kalenikaliaksandr [@kmacdough]: https://github.com/kmacdough @@ -269,4 +273,8 @@ avoid adding features or APIs which do not map onto the [@mngr777]: https://github.com/mngr777 [@trylinka]: https://github.com/trylinka [@rustprooflabs]: https://github.com/rustprooflabs +<<<<<<< HEAD [@robertozimek]: https://github.com/robertozimek +======= +[@bayandin]: https://github.com/bayandin +>>>>>>> 7fbe5bb (Add CHANGELOG entry for #140 and add tests to verify)