From 065e7288a554e4429fc8f9dc66403fd14690dd60 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Thu, 27 Feb 2025 21:11:51 -0800 Subject: [PATCH 1/4] Use `ubuntu-latest`. --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1366b1c..40df280 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,7 +11,7 @@ jobs: name: Unit Tests strategy: matrix: - os: [ubuntu-20.04, macos-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: From a162d1983b27c42b7e015d214b612acb1589225e Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Thu, 27 Feb 2025 21:24:49 -0800 Subject: [PATCH 2/4] Install libuuid. --- .github/workflows/pr.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 40df280..9cd8ccb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -19,6 +19,10 @@ jobs: with: submodules: recursive + - name: Install uuid-dev on Ubuntu + if: runner.os == 'Linux' + run: sudo apt-get update && sudo apt-get install -y uuid-dev + - name: Run tests run: ./run_test.sh shell: bash From 88bfae8da53566359b80c936f5c19a7576a3d6b8 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Thu, 27 Feb 2025 21:42:36 -0800 Subject: [PATCH 3/4] Remove old submodule. --- .gitmodules | 3 --- third-party/catch2 | 1 - 2 files changed, 4 deletions(-) delete mode 160000 third-party/catch2 diff --git a/.gitmodules b/.gitmodules index 162b883..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "third-party/catch2"] - path = third-party/catch2 - url = https://github.com/duckduckgo/Catch2.git diff --git a/third-party/catch2 b/third-party/catch2 deleted file mode 160000 index 87074da..0000000 --- a/third-party/catch2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87074da73ecb1c2e7c35fd14f50ca21c4c002adc From 959bc13c006694575777fa0839122f7cfc52c43c Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Thu, 27 Feb 2025 21:49:35 -0800 Subject: [PATCH 4/4] Add updated catch2 dependency. --- .gitmodules | 3 +++ third-party/catch2 | 1 + 2 files changed, 4 insertions(+) create mode 160000 third-party/catch2 diff --git a/.gitmodules b/.gitmodules index e69de29..5faef87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "third-party/catch2"] + path = third-party/catch2 + url = https://github.com/catchorg/Catch2.git diff --git a/third-party/catch2 b/third-party/catch2 new file mode 160000 index 0000000..182c910 --- /dev/null +++ b/third-party/catch2 @@ -0,0 +1 @@ +Subproject commit 182c910b4b63ff587a3440e08f84f70497e49a81