From 409c21750195f9de9f293c625bea788e37b855d1 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 16:49:50 -0700
Subject: [PATCH 01/23] Begin adding Github Actions for tests

---
 .github/workflows/tests.yml | 58 +++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 000000000..528d2199b
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,58 @@
+name: tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Py${{ matrix.compiler }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        # compiler: [clang, gcc, msvc]
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+
+      ## Start Windows stuff
+      - uses: ilammy/msvc-dev-cmd@v1.2.0
+        if: startsWith(matrix.os, 'windows')
+
+      - name: Set Windows Compiler
+        if: startsWith(matrix.os, 'windows')
+        # && matrix.compiler == 'msvc'
+        run: |
+          echo "::set-env name=CC::cl.exe"
+          echo "::set-env name=CXX::cl.exe"
+      ## End Windows stuff
+
+      - name: Configure build
+        run: |
+          mkdir build
+          cd build
+          cmake -DWARNINGS_AS_ERRORS=ON ..
+
+      - name: Build
+        run: make
+
+      - name: Tests
+        run: |
+          make test
+          sudo make install
+
+      - name: Test packaging
+        if: startsWith(matrix.os, 'ubuntu')
+        run: cpack -D CPACK_PACKAGE_CONTACT="Test build in CI"
+
+      - name: Examples
+        run: |
+          mkdir examples
+          cd examples
+          cmake ../../examples
+          make
+          make test

From 4d8cceab2e151bc5fa0bd1b2ad26ea355790c658 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 16:57:16 -0700
Subject: [PATCH 02/23] working directory fix

---
 .github/workflows/tests.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 528d2199b..b9ec37d76 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: Py${{ matrix.compiler }} ${{ matrix.os }}
+    name: Test Compile ${{ matrix.compiler }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -32,27 +32,27 @@ jobs:
       ## End Windows stuff
 
       - name: Configure build
-        run: |
-          mkdir build
-          cd build
-          cmake -DWARNINGS_AS_ERRORS=ON ..
+        run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
 
       - name: Build
+        working-directory: build
         run: make
 
       - name: Tests
+        working-directory: build
         run: |
           make test
           sudo make install
 
       - name: Test packaging
+        working-directory: build
         if: startsWith(matrix.os, 'ubuntu')
         run: cpack -D CPACK_PACKAGE_CONTACT="Test build in CI"
 
       - name: Examples
         run: |
-          mkdir examples
-          cd examples
+          mkdir build/examples
+          cd build/examples
           cmake ../../examples
           make
           make test

From 738beb2c6a2fa983480bf1441db7c495e952939b Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 17:11:27 -0700
Subject: [PATCH 03/23] split out windows tests

---
 .github/workflows/tests.yml   | 24 ++++++++----------
 .github/workflows/windows.yml | 48 +++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 .github/workflows/windows.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b9ec37d76..7dfc62a77 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,31 +13,27 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        # compiler: [clang, gcc, msvc]
+        os: [macos-latest, ubuntu-latest]
+        compiler: [clang, gcc]
 
     steps:
       - uses: actions/checkout@v2.1.1
 
-      ## Start Windows stuff
-      - uses: ilammy/msvc-dev-cmd@v1.2.0
-        if: startsWith(matrix.os, 'windows')
-
-      - name: Set Windows Compiler
-        if: startsWith(matrix.os, 'windows')
-        # && matrix.compiler == 'msvc'
-        run: |
-          echo "::set-env name=CC::cl.exe"
-          echo "::set-env name=CXX::cl.exe"
-      ## End Windows stuff
-
       - name: Configure build
+        env:
+          CC: ${{ matrix.compiler }}
         run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
 
       - name: Build
         working-directory: build
         run: make
 
+      - name: binding-functions
+        working-directory: build
+        run: |
+          make binding-functions
+          test -s binding-functions
+
       - name: Tests
         working-directory: build
         run: |
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 000000000..2c8baf667
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,48 @@
+name: windows-tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Test Compile ${{ matrix.compiler }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+        compiler: [msvc]
+        config: [Release, Debug]
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+
+      - uses: ilammy/msvc-dev-cmd@v1.2.0
+
+      - name: Set Windows Compiler
+        run: |
+          echo "::set-env name=CC::cl.exe"
+          echo "::set-env name=CXX::cl.exe"
+
+      - name: Configure build
+        env:
+          CC: cl.exe
+          CXX: cl.exe
+        run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
+
+      - name: Build
+        working-directory: build
+        run: cmake --config ${{ matrix.config }} ..
+
+      - name: binding-functions
+        working-directory: build
+        run: |
+          cmake --config ${{ matrix.config }} --target binding-functions ..
+          if ((Get-Item "binding-functions").Length -lt 10) { $host.SetShouldExit(1) }
+
+      - name: Tests
+        working-directory: build
+        run: ctest -C ${{ matrix.config }}

From 5050bbc1c342c1fba96edff9b1857dbc98a9c962 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 17:21:20 -0700
Subject: [PATCH 04/23] consistent compiler

---
 .github/workflows/tests.yml   | 4 ++--
 .github/workflows/windows.yml | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7dfc62a77..c8169d834 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,6 +10,8 @@ jobs:
   tests:
     name: Test Compile ${{ matrix.compiler }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    env:
+      CC: ${{ matrix.compiler }}
 
     strategy:
       matrix:
@@ -20,8 +22,6 @@ jobs:
       - uses: actions/checkout@v2.1.1
 
       - name: Configure build
-        env:
-          CC: ${{ matrix.compiler }}
         run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
 
       - name: Build
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2c8baf667..068d52166 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -8,13 +8,12 @@ on:
 
 jobs:
   tests:
-    name: Test Compile ${{ matrix.compiler }} ${{ matrix.os }}
+    name: Test Compile ${{ matrix.config }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [windows-latest]
-        compiler: [msvc]
         config: [Release, Debug]
 
     steps:

From 84b640f7872d84fb2745f9f7541dd93b55abf70e Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 18:02:57 -0700
Subject: [PATCH 05/23] Add Valgrind, etc

---
 .github/workflows/coverage-linux.yml          | 37 ++++++++++++++++
 .../workflows/{tests.yml => test-linux.yml}   | 21 +++++++---
 .github/workflows/test-osx.yml                | 42 +++++++++++++++++++
 .github/workflows/test-valgrind.yml           | 31 ++++++++++++++
 .github/workflows/test-website.yml            | 29 +++++++++++++
 .../{windows.yml => test-windows.yml}         |  6 +--
 6 files changed, 158 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/coverage-linux.yml
 rename .github/workflows/{tests.yml => test-linux.yml} (67%)
 create mode 100644 .github/workflows/test-osx.yml
 create mode 100644 .github/workflows/test-valgrind.yml
 create mode 100644 .github/workflows/test-website.yml
 rename .github/workflows/{windows.yml => test-windows.yml} (92%)

diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml
new file mode 100644
index 000000000..2a2f77df6
--- /dev/null
+++ b/.github/workflows/coverage-linux.yml
@@ -0,0 +1,37 @@
+name: coverage-linux
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Coverage
+    runs-on: ubuntu-latest
+    env:
+      CC: gcc
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+      
+      - name: Install lcov
+        run: sudo apt-get install lcov
+      
+      - name: Install coveralls-lcov
+        run: gem install coveralls-lcov
+
+      - name: Configure build
+        run: cmake -DCMAKE_BUILD_TYPE=Debug -DWARNINGS_AS_ERRORS=ON -DH3_PREFIX=testprefix_ .
+
+      - name: Build
+        run: make
+
+      - name: Tests
+        run: |
+          make test
+          sudo make install
+
+      - name: Submit coverage
+        run: coveralls-lcov coverage.cleaned.info
diff --git a/.github/workflows/tests.yml b/.github/workflows/test-linux.yml
similarity index 67%
rename from .github/workflows/tests.yml
rename to .github/workflows/test-linux.yml
index c8169d834..a2f86de76 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/test-linux.yml
@@ -1,4 +1,4 @@
-name: tests
+name: test-linux
 
 on:
   push:
@@ -8,22 +8,33 @@ on:
 
 jobs:
   tests:
-    name: Test Compile ${{ matrix.compiler }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Test Compile ${{ matrix.compiler }}
+    runs-on: ubuntu-latest
     env:
       CC: ${{ matrix.compiler }}
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
         compiler: [clang, gcc]
 
     steps:
       - uses: actions/checkout@v2.1.1
+      
+      - name: Install Doxygen
+        run: sudo apt-get install doxygen graphviz
+
+      - name: Install clang-format
+        run: sudo apt-get install clang-format-9
 
       - name: Configure build
         run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
 
+      - name: Formatting check
+        run: |
+          clang-format-9 --version
+          make format
+          git diff --exit-code
+
       - name: Build
         working-directory: build
         run: make
@@ -40,9 +51,9 @@ jobs:
           make test
           sudo make install
 
+        # Note the packages aren't used to test the examples below
       - name: Test packaging
         working-directory: build
-        if: startsWith(matrix.os, 'ubuntu')
         run: cpack -D CPACK_PACKAGE_CONTACT="Test build in CI"
 
       - name: Examples
diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
new file mode 100644
index 000000000..983b67080
--- /dev/null
+++ b/.github/workflows/test-osx.yml
@@ -0,0 +1,42 @@
+name: test-osx
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Test Compile ${{ matrix.compiler }}
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+
+      - name: Configure build
+        run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
+
+      - name: Build
+        working-directory: build
+        run: make
+
+      - name: binding-functions
+        working-directory: build
+        run: |
+          make binding-functions
+          test -s binding-functions
+
+      - name: Tests
+        working-directory: build
+        run: |
+          make test
+          sudo make install
+
+      - name: Examples
+        run: |
+          mkdir build/examples
+          cd build/examples
+          cmake ../../examples
+          make
+          make test
diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml
new file mode 100644
index 000000000..6bf72ad0d
--- /dev/null
+++ b/.github/workflows/test-valgrind.yml
@@ -0,0 +1,31 @@
+name: test-valgrind
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Test Valgrind
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+      
+      - name: Install Valgrind
+        run: sudo apt-get install valgrind
+
+      - name: Configure build
+        run: cmake -Bbuild -DCMAKE_BUILD_TYPE=Debug -DWRAP_VALGRIND=ON .
+
+      - name: Build
+        working-directory: build
+        run: make
+
+      - name: Tests
+        working-directory: build
+        env:
+          CTEST_OUTPUT_ON_FAILURE: 1
+        run: make test-fast
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
new file mode 100644
index 000000000..b7f1dbaf4
--- /dev/null
+++ b/.github/workflows/test-website.yml
@@ -0,0 +1,29 @@
+name: test-linux
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Test Website
+    runs-on: ubuntu-latest
+    node-version: 10.x
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+      
+      - name: Install FOSSA
+        run: |
+          curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash
+      
+      - name: Test Website Build
+        working-directory: website
+        run: |
+          yarn
+          yarn build
+
+      - name: Submit FOSSA report
+        run: if [ -n "$FOSSA_API_KEY" ]; then fossa; fi
\ No newline at end of file
diff --git a/.github/workflows/windows.yml b/.github/workflows/test-windows.yml
similarity index 92%
rename from .github/workflows/windows.yml
rename to .github/workflows/test-windows.yml
index 068d52166..3cccf462c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -1,4 +1,4 @@
-name: windows-tests
+name: test-windows
 
 on:
   push:
@@ -34,12 +34,12 @@ jobs:
 
       - name: Build
         working-directory: build
-        run: cmake --config ${{ matrix.config }} ..
+        run: cmake --config ${{ matrix.config }} .
 
       - name: binding-functions
         working-directory: build
         run: |
-          cmake --config ${{ matrix.config }} --target binding-functions ..
+          cmake --config ${{ matrix.config }} --target binding-functions .
           if ((Get-Item "binding-functions").Length -lt 10) { $host.SetShouldExit(1) }
 
       - name: Tests

From b45a44b853eec9df95fc43ac685b18a866650ff8 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 18:10:35 -0700
Subject: [PATCH 06/23] wip

---
 .github/workflows/coverage-linux.yml | 9 ++++-----
 .github/workflows/test-linux.yml     | 4 +---
 .github/workflows/test-website.yml   | 8 ++++++--
 .github/workflows/test-windows.yml   | 4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml
index 2a2f77df6..e59039fed 100644
--- a/.github/workflows/coverage-linux.yml
+++ b/.github/workflows/coverage-linux.yml
@@ -18,9 +18,6 @@ jobs:
       
       - name: Install lcov
         run: sudo apt-get install lcov
-      
-      - name: Install coveralls-lcov
-        run: gem install coveralls-lcov
 
       - name: Configure build
         run: cmake -DCMAKE_BUILD_TYPE=Debug -DWARNINGS_AS_ERRORS=ON -DH3_PREFIX=testprefix_ .
@@ -33,5 +30,7 @@ jobs:
           make test
           sudo make install
 
-      - name: Submit coverage
-        run: coveralls-lcov coverage.cleaned.info
+      - name: Submit Coveralls Coverage
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index a2f86de76..03306db7c 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -23,13 +23,11 @@ jobs:
       - name: Install Doxygen
         run: sudo apt-get install doxygen graphviz
 
-      - name: Install clang-format
-        run: sudo apt-get install clang-format-9
-
       - name: Configure build
         run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
 
       - name: Formatting check
+        working-directory: build
         run: |
           clang-format-9 --version
           make format
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
index b7f1dbaf4..282f04233 100644
--- a/.github/workflows/test-website.yml
+++ b/.github/workflows/test-website.yml
@@ -1,4 +1,4 @@
-name: test-linux
+name: test-website
 
 on:
   push:
@@ -10,11 +10,15 @@ jobs:
   tests:
     name: Test Website
     runs-on: ubuntu-latest
-    node-version: 10.x
 
     steps:
       - uses: actions/checkout@v2.1.1
       
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+
       - name: Install FOSSA
         run: |
           curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 3cccf462c..4ca376579 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -34,12 +34,12 @@ jobs:
 
       - name: Build
         working-directory: build
-        run: cmake --config ${{ matrix.config }} .
+        run: cmake --build . --config ${{ matrix.config }}
 
       - name: binding-functions
         working-directory: build
         run: |
-          cmake --config ${{ matrix.config }} --target binding-functions .
+          cmake --build . --config ${{ matrix.config }} --target binding-functions
           if ((Get-Item "binding-functions").Length -lt 10) { $host.SetShouldExit(1) }
 
       - name: Tests

From c17d226ac6a91e0da710da2ea30f55599804bad7 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 18:25:28 -0700
Subject: [PATCH 07/23] CTest output for Windows

---
 .github/workflows/coverage-linux.yml |  6 +++---
 .github/workflows/test-linux.yml     |  2 +-
 .github/workflows/test-osx.yml       | 15 ++++++++-------
 .github/workflows/test-valgrind.yml  |  2 +-
 .github/workflows/test-website.yml   | 11 +++++------
 .github/workflows/test-windows.yml   |  7 ++++---
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml
index e59039fed..4130bed74 100644
--- a/.github/workflows/coverage-linux.yml
+++ b/.github/workflows/coverage-linux.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.1.1
-      
+
       - name: Install lcov
         run: sudo apt-get install lcov
 
@@ -30,7 +30,7 @@ jobs:
           make test
           sudo make install
 
-      - name: Submit Coveralls Coverage
-        uses: coverallsapp/github-action@master
+      - uses: coverallsapp/github-action@master
         with:
+          path-to-lcov: ./coverage.info
           github-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 03306db7c..7d3d50fce 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.1.1
-      
+
       - name: Install Doxygen
         run: sudo apt-get install doxygen graphviz
 
diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
index 983b67080..8e31db884 100644
--- a/.github/workflows/test-osx.yml
+++ b/.github/workflows/test-osx.yml
@@ -33,10 +33,11 @@ jobs:
           make test
           sudo make install
 
-      - name: Examples
-        run: |
-          mkdir build/examples
-          cd build/examples
-          cmake ../../examples
-          make
-          make test
+      # TODO: Doesn't build because of h3/h3api.h not found
+      # - name: Examples
+      #   run: |
+      #     mkdir build/examples
+      #     cd build/examples
+      #     cmake ../../examples
+      #     make
+      #     make test
diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml
index 6bf72ad0d..09bfbcfe1 100644
--- a/.github/workflows/test-valgrind.yml
+++ b/.github/workflows/test-valgrind.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.1.1
-      
+
       - name: Install Valgrind
         run: sudo apt-get install valgrind
 
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
index 282f04233..7fb9ee02f 100644
--- a/.github/workflows/test-website.yml
+++ b/.github/workflows/test-website.yml
@@ -8,21 +8,20 @@ on:
 
 jobs:
   tests:
-    name: Test Website
+    name: Test Website and FOSSA
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2.1.1
-      
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+
+      - uses: actions/setup-node@v1
         with:
           node-version: 10.x
 
       - name: Install FOSSA
         run: |
           curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash
-      
+
       - name: Test Website Build
         working-directory: website
         run: |
@@ -30,4 +29,4 @@ jobs:
           yarn build
 
       - name: Submit FOSSA report
-        run: if [ -n "$FOSSA_API_KEY" ]; then fossa; fi
\ No newline at end of file
+        run: if [ -n "${{ secrets.FOSSA_API_KEY }}" ]; then fossa; fi
\ No newline at end of file
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 4ca376579..ee0435a39 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -8,12 +8,11 @@ on:
 
 jobs:
   tests:
-    name: Test Compile ${{ matrix.config }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Test Compile ${{ matrix.config }}
+    runs-on: windows-latest
 
     strategy:
       matrix:
-        os: [windows-latest]
         config: [Release, Debug]
 
     steps:
@@ -44,4 +43,6 @@ jobs:
 
       - name: Tests
         working-directory: build
+        env:
+          CTEST_OUTPUT_ON_FAILURE: 1
         run: ctest -C ${{ matrix.config }}

From 1367d1130e36c1840bbc6cf0ba833855f1c9c56e Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 18:28:29 -0700
Subject: [PATCH 08/23] Run coverage on coverage

---
 .github/workflows/coverage-linux.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml
index 4130bed74..69fdac5e5 100644
--- a/.github/workflows/coverage-linux.yml
+++ b/.github/workflows/coverage-linux.yml
@@ -26,11 +26,9 @@ jobs:
         run: make
 
       - name: Tests
-        run: |
-          make test
-          sudo make install
+        run: make coverage
 
       - uses: coverallsapp/github-action@master
         with:
-          path-to-lcov: ./coverage.info
+          path-to-lcov: ./coverage.cleaned.info
           github-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 8c2888bb063a46302319c6e650cdccaaa965a327 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 18:33:02 -0700
Subject: [PATCH 09/23] Run Windows tests using cmd

---
 .github/workflows/test-windows.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index ee0435a39..3e55a09bb 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -43,6 +43,7 @@ jobs:
 
       - name: Tests
         working-directory: build
+        shell: cmd
         env:
           CTEST_OUTPUT_ON_FAILURE: 1
         run: ctest -C ${{ matrix.config }}

From 1475bbb614cbfdb36ac6514d83d022d81d6c9ee0 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 11 Aug 2020 18:45:23 -0700
Subject: [PATCH 10/23] Use cmd also for configure

---
 .github/workflows/test-windows.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 3e55a09bb..934796894 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -10,6 +10,9 @@ jobs:
   tests:
     name: Test Compile ${{ matrix.config }}
     runs-on: windows-latest
+    env:
+      CC: cl.exe
+      CXX: cl.exe
 
     strategy:
       matrix:
@@ -20,15 +23,8 @@ jobs:
 
       - uses: ilammy/msvc-dev-cmd@v1.2.0
 
-      - name: Set Windows Compiler
-        run: |
-          echo "::set-env name=CC::cl.exe"
-          echo "::set-env name=CXX::cl.exe"
-
       - name: Configure build
-        env:
-          CC: cl.exe
-          CXX: cl.exe
+        shell: cmd
         run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
 
       - name: Build

From c41dc44f55985775ec5d05eb7bd80f56a084a525 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 10:18:41 -0700
Subject: [PATCH 11/23] Disable Windows test running

---
 .github/workflows/test-windows.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 934796894..641c7b829 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -37,9 +37,10 @@ jobs:
           cmake --build . --config ${{ matrix.config }} --target binding-functions
           if ((Get-Item "binding-functions").Length -lt 10) { $host.SetShouldExit(1) }
 
-      - name: Tests
-        working-directory: build
-        shell: cmd
-        env:
-          CTEST_OUTPUT_ON_FAILURE: 1
-        run: ctest -C ${{ matrix.config }}
+      # TODO: Doesn't work because of tests reading from stdin
+      # - name: Tests
+      #   working-directory: build
+      #   shell: cmd
+      #   env:
+      #     CTEST_OUTPUT_ON_FAILURE: 1
+      #   run: ctest -C ${{ matrix.config }}

From 6f30f3306e74a24f59c8665a84daf17c992f7553 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 10:23:04 -0700
Subject: [PATCH 12/23] Add arch to Windows build

---
 .github/workflows/test-windows.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 641c7b829..7bc921b02 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: Test Compile ${{ matrix.config }}
+    name: Test Compile ${{ matrix.config }} ${{ matrix.arch }}
     runs-on: windows-latest
     env:
       CC: cl.exe
@@ -17,11 +17,14 @@ jobs:
     strategy:
       matrix:
         config: [Release, Debug]
+        arch: [x86, x64]
 
     steps:
       - uses: actions/checkout@v2.1.1
 
       - uses: ilammy/msvc-dev-cmd@v1.2.0
+        with:
+          arch: ${{ matrix.arch }}
 
       - name: Configure build
         shell: cmd

From c5ba95a719aea25e9e861766d41cbe7f48937b7e Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 10:49:26 -0700
Subject: [PATCH 13/23] Set arch on CMake

---
 .github/workflows/test-windows.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 7bc921b02..2833e1b9f 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -17,18 +17,16 @@ jobs:
     strategy:
       matrix:
         config: [Release, Debug]
-        arch: [x86, x64]
+        arch: [Win32, x64]
 
     steps:
       - uses: actions/checkout@v2.1.1
 
       - uses: ilammy/msvc-dev-cmd@v1.2.0
-        with:
-          arch: ${{ matrix.arch }}
 
       - name: Configure build
         shell: cmd
-        run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .
+        run: cmake -Bbuild -A ${{ matrix.arch }} -DWARNINGS_AS_ERRORS=ON .
 
       - name: Build
         working-directory: build

From be2c2cb7eb94c1ff5deebe0e11a41ce658a9737b Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 10:53:23 -0700
Subject: [PATCH 14/23] test formatting error

---
 src/h3lib/lib/h3Index.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/h3lib/lib/h3Index.c b/src/h3lib/lib/h3Index.c
index cf667a672..1ece0b3d3 100644
--- a/src/h3lib/lib/h3Index.c
+++ b/src/h3lib/lib/h3Index.c
@@ -46,7 +46,7 @@ int H3_EXPORT(h3GetResolution)(H3Index h) { return H3_GET_RESOLUTION(h); }
  * @param h The H3 cell.
  * @return The base cell "number" of the H3 cell argument.
  */
-int H3_EXPORT(h3GetBaseCell)(H3Index h) { return H3_GET_BASE_CELL(h); }
+int   H3_EXPORT(h3GetBaseCell)(H3Index h) { return H3_GET_BASE_CELL(h); }
 
 /**
  * Converts a string representation of an H3 index into an H3 index.

From c85f0ec784c75458ce308fd8cc9b0cc52054e180 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 10:54:48 -0700
Subject: [PATCH 15/23] Revert "test formatting error"

This reverts commit be2c2cb7eb94c1ff5deebe0e11a41ce658a9737b.
---
 src/h3lib/lib/h3Index.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/h3lib/lib/h3Index.c b/src/h3lib/lib/h3Index.c
index 1ece0b3d3..cf667a672 100644
--- a/src/h3lib/lib/h3Index.c
+++ b/src/h3lib/lib/h3Index.c
@@ -46,7 +46,7 @@ int H3_EXPORT(h3GetResolution)(H3Index h) { return H3_GET_RESOLUTION(h); }
  * @param h The H3 cell.
  * @return The base cell "number" of the H3 cell argument.
  */
-int   H3_EXPORT(h3GetBaseCell)(H3Index h) { return H3_GET_BASE_CELL(h); }
+int H3_EXPORT(h3GetBaseCell)(H3Index h) { return H3_GET_BASE_CELL(h); }
 
 /**
  * Converts a string representation of an H3 index into an H3 index.

From 43f68e75a702dd40ffd61e570d64b41eb24a7416 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 10:57:30 -0700
Subject: [PATCH 16/23] Remove some tests now run in Github Actions

---
 .travis.yml  | 32 --------------------------------
 appveyor.yml |  5 -----
 2 files changed, 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3acc25265..7507d1146 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,20 +30,6 @@ addons:
 
 matrix:
   include:
-      # Check that clang-format doesn't detect some files are not formatted.
-    - name: "Formatting check"
-      compiler: clang
-      addons:
-        apt:
-          sources:
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-          packages:
-            - clang-format-9
-      script:
-        - clang-format-9 --version
-        - make format
-        - git diff --exit-code
       # Submit coverage report to Coveralls.io, also test that prefixing works.
     - name: "Coverage report"
       compiler: gcc
@@ -73,24 +59,8 @@ matrix:
         - yarn build
         - cd ..
         - 'if [ -n "$FOSSA_API_KEY" ]; then fossa; fi'
-    - name: "Valgrind test"
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - valgrind
-      before_script:
-        - cmake -DCMAKE_BUILD_TYPE=Debug -DWRAP_VALGRIND=ON .
-      script:
-        - make
-        - CTEST_OUTPUT_ON_FAILURE=1 make test-fast
     - name: "Mac OSX (Xcode 8)"
       os: osx
-    - name: "binding-functions target"
-      script:
-        - make binding-functions
-        # Check that the file exists and has contents
-        - test -s binding-functions
     - name: "ARM64"
       arch: arm64
 
@@ -105,8 +75,6 @@ script:
   - make
   - make test
   - sudo make install
-  # Note the packages aren't used to test the examples below
-  - 'if [ "$TRAVIS_OS_NAME" = "linux" ]; then cpack -D CPACK_PACKAGE_CONTACT="Test build in CI"; fi'
   - mkdir examples
   - cd examples
   - cmake ../../examples
diff --git a/appveyor.yml b/appveyor.yml
index 9b2d02ee4..d22a18559 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,12 +39,7 @@ environment:
 build_script:
   - cmake "-G%GENERATOR%" -H. -Bbuild
   - cmake --build build --config "%CONFIG%"
-  - cmake --build build --config "%CONFIG%" --target binding-functions
 
 test_script:
   - ps: cd build
   - ctest -C "%CONFIG%"
-  # Check that binding-functions was generated and has content
-  - ps: |
-      $ErrorActionPreference = "Stop"
-      if ((Get-Item "binding-functions").Length -lt 10) { $host.SetShouldExit(1) }

From f2623a1b05e9ba0848825e17cd7c62975e498776 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 11:11:45 -0700
Subject: [PATCH 17/23] Newline at end of file

---
 .github/workflows/coverage-linux.yml | 2 +-
 .github/workflows/test-website.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml
index 69fdac5e5..37ff13f0d 100644
--- a/.github/workflows/coverage-linux.yml
+++ b/.github/workflows/coverage-linux.yml
@@ -31,4 +31,4 @@ jobs:
       - uses: coverallsapp/github-action@master
         with:
           path-to-lcov: ./coverage.cleaned.info
-          github-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
index 7fb9ee02f..2bb16fbec 100644
--- a/.github/workflows/test-website.yml
+++ b/.github/workflows/test-website.yml
@@ -29,4 +29,4 @@ jobs:
           yarn build
 
       - name: Submit FOSSA report
-        run: if [ -n "${{ secrets.FOSSA_API_KEY }}" ]; then fossa; fi
\ No newline at end of file
+        run: if [ -n "${{ secrets.FOSSA_API_KEY }}" ]; then fossa; fi

From b95c1cf76907e47c3e0f9f34835ddb192a7ed308 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 17:07:45 -0700
Subject: [PATCH 18/23] Fix Windows tests by switching to bash

---
 .github/workflows/test-windows.yml | 15 ++++++---------
 CMakeLists.txt                     |  9 +++------
 dev-docs/build_windows.md          |  7 ++++++-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 2833e1b9f..e7211cc84 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -22,8 +22,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2.1.1
 
-      - uses: ilammy/msvc-dev-cmd@v1.2.0
-
       - name: Configure build
         shell: cmd
         run: cmake -Bbuild -A ${{ matrix.arch }} -DWARNINGS_AS_ERRORS=ON .
@@ -38,10 +36,9 @@ jobs:
           cmake --build . --config ${{ matrix.config }} --target binding-functions
           if ((Get-Item "binding-functions").Length -lt 10) { $host.SetShouldExit(1) }
 
-      # TODO: Doesn't work because of tests reading from stdin
-      # - name: Tests
-      #   working-directory: build
-      #   shell: cmd
-      #   env:
-      #     CTEST_OUTPUT_ON_FAILURE: 1
-      #   run: ctest -C ${{ matrix.config }}
+      - name: Tests
+        working-directory: build
+        shell: cmd
+        env:
+          CTEST_OUTPUT_ON_FAILURE: 1
+        run: ctest -C ${{ matrix.config }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aabe2f7dc..e3009be6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,8 @@ option(BUILD_FILTERS "Build filter applications." ON)
 option(BUILD_GENERATORS "Build code generation applications." ON)
 
 if(WIN32)
-    set(SHELL PowerShell -Command)
+    # Use bash (usually from Git for Windows) for piping results
+    set(SHELL bash -c)
 
     set(EXECUTABLE_OUTPUT_PATH bin)
     set(LIBRARY_OUTPUT_PATH bin)
@@ -478,11 +479,7 @@ if(BUILD_TESTING)
     macro(add_h3_test_with_file name srcfile argfile)
         add_h3_test_common(${name} ${srcfile})
         # add a special command (so we don't need to read the test file from the test program)
-        if(WIN32)
-            set(dump_command "Get-Content")
-        else()
-            set(dump_command "cat")
-        endif()
+        set(dump_command "cat")
 
         add_test(NAME ${name}_test${test_number}
                  COMMAND ${SHELL} "${dump_command} ${argfile} | ${TEST_WRAPPER_STR} $<TARGET_FILE:${name}>")
diff --git a/dev-docs/build_windows.md b/dev-docs/build_windows.md
index 8240239ad..d9a2fa162 100644
--- a/dev-docs/build_windows.md
+++ b/dev-docs/build_windows.md
@@ -10,9 +10,14 @@ cd build
 cmake ..
 ```
 
-You can now open `h3.sln` and build the `ALL_BUILD` project to build the H3 library, filter applications, and tests. Tests can be run by building the `RUN_TESTS` project. From the command line:
+You can now open `h3.sln` and build the `ALL_BUILD` project to build the H3 library, filter applications, and tests. From the command line:
 
 ```
 msbuild ALL_BUILD.vcxproj
+```
+
+Tests can be run by building the `RUN_TESTS` project. Tests require `bash` be available, which is usually supplied by Git for Windows. From the command line:
+
+```
 msbuild RUN_TESTS.vcxproj
 ```

From 9e6d02c96dd4bd9b540740a3cb7ab45a1ea62c10 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Mon, 17 Aug 2020 18:54:53 -0700
Subject: [PATCH 19/23] Disable Appveyor

---
 appveyor.yml | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index d22a18559..000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2014, Ruslan Baratov
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-environment:
-  matrix:
-    - GENERATOR: "Visual Studio 12"
-      CONFIG: Debug
-
-    - GENERATOR: "Visual Studio 12"
-      CONFIG: Release
-
-    - GENERATOR: "Visual Studio 12 Win64"
-      CONFIG: Debug
-
-    - GENERATOR: "Visual Studio 12 Win64"
-      CONFIG: Release
-
-build_script:
-  - cmake "-G%GENERATOR%" -H. -Bbuild
-  - cmake --build build --config "%CONFIG%"
-
-test_script:
-  - ps: cd build
-  - ctest -C "%CONFIG%"

From 18783bb121250270087a9fa77a5c046cc11df72a Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Tue, 18 Aug 2020 10:32:14 -0700
Subject: [PATCH 20/23] Merge linux based tests into one workflow

---
 .github/workflows/coverage-linux.yml | 34 -------------------
 .github/workflows/test-linux.yml     | 49 ++++++++++++++++++++++++++++
 .github/workflows/test-valgrind.yml  | 31 ------------------
 3 files changed, 49 insertions(+), 65 deletions(-)
 delete mode 100644 .github/workflows/coverage-linux.yml
 delete mode 100644 .github/workflows/test-valgrind.yml

diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml
deleted file mode 100644
index 37ff13f0d..000000000
--- a/.github/workflows/coverage-linux.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: coverage-linux
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  tests:
-    name: Coverage
-    runs-on: ubuntu-latest
-    env:
-      CC: gcc
-
-    steps:
-      - uses: actions/checkout@v2.1.1
-
-      - name: Install lcov
-        run: sudo apt-get install lcov
-
-      - name: Configure build
-        run: cmake -DCMAKE_BUILD_TYPE=Debug -DWARNINGS_AS_ERRORS=ON -DH3_PREFIX=testprefix_ .
-
-      - name: Build
-        run: make
-
-      - name: Tests
-        run: make coverage
-
-      - uses: coverallsapp/github-action@master
-        with:
-          path-to-lcov: ./coverage.cleaned.info
-          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 7d3d50fce..aa023d9fb 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -61,3 +61,52 @@ jobs:
           cmake ../../examples
           make
           make test
+
+  valgrind-tests:
+    name: Test Valgrind
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+
+      - name: Install Valgrind
+        run: sudo apt-get install valgrind
+
+      - name: Configure build
+        run: cmake -Bbuild -DCMAKE_BUILD_TYPE=Debug -DWRAP_VALGRIND=ON .
+
+      - name: Build
+        working-directory: build
+        run: make
+
+      - name: Tests
+        working-directory: build
+        env:
+          CTEST_OUTPUT_ON_FAILURE: 1
+        run: make test-fast
+
+  coverage-tests:
+    name: Coverage
+    runs-on: ubuntu-latest
+    env:
+      CC: gcc
+
+    steps:
+      - uses: actions/checkout@v2.1.1
+
+      - name: Install lcov
+        run: sudo apt-get install lcov
+
+      - name: Configure build
+        run: cmake -DCMAKE_BUILD_TYPE=Debug -DWARNINGS_AS_ERRORS=ON -DH3_PREFIX=testprefix_ .
+
+      - name: Build
+        run: make
+
+      - name: Tests
+        run: make coverage
+
+      - uses: coverallsapp/github-action@master
+        with:
+          path-to-lcov: ./coverage.cleaned.info
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml
deleted file mode 100644
index 09bfbcfe1..000000000
--- a/.github/workflows/test-valgrind.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: test-valgrind
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  tests:
-    name: Test Valgrind
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2.1.1
-
-      - name: Install Valgrind
-        run: sudo apt-get install valgrind
-
-      - name: Configure build
-        run: cmake -Bbuild -DCMAKE_BUILD_TYPE=Debug -DWRAP_VALGRIND=ON .
-
-      - name: Build
-        working-directory: build
-        run: make
-
-      - name: Tests
-        working-directory: build
-        env:
-          CTEST_OUTPUT_ON_FAILURE: 1
-        run: make test-fast

From ff92851c351b2fe1dbbfc79a5bf8a5a4b311a819 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Wed, 19 Aug 2020 12:38:40 -0700
Subject: [PATCH 21/23] Note use of bash in changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24b7ab289..b10997c44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The public API of this library consists of the functions declared in file
 ## [Unreleased]
 ### Fixed
 - Fixed building the library with custom memory allocation functions on Mac OSX. (#362)
+### Changed
+- Tests now use `bash` on Windows. (#381)
 
 ## [3.6.4] - 2020-06-19
 ### Added

From b46f45caa8277c8b85022efe557d4c64596063d8 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@unfolded.ai>
Date: Thu, 20 Aug 2020 00:00:14 -0700
Subject: [PATCH 22/23] Try to fix OSX tests

---
 .github/workflows/test-osx.yml | 15 +++++++--------
 CHANGELOG.md                   |  1 +
 CMakeLists.txt                 |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
index 8e31db884..983b67080 100644
--- a/.github/workflows/test-osx.yml
+++ b/.github/workflows/test-osx.yml
@@ -33,11 +33,10 @@ jobs:
           make test
           sudo make install
 
-      # TODO: Doesn't build because of h3/h3api.h not found
-      # - name: Examples
-      #   run: |
-      #     mkdir build/examples
-      #     cd build/examples
-      #     cmake ../../examples
-      #     make
-      #     make test
+      - name: Examples
+        run: |
+          mkdir build/examples
+          cd build/examples
+          cmake ../../examples
+          make
+          make test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b10997c44..8414957f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The public API of this library consists of the functions declared in file
 ## [Unreleased]
 ### Fixed
 - Fixed building the library with custom memory allocation functions on Mac OSX. (#362)
+- The installed H3 CMake target should have include directories specified. (#381)
 ### Changed
 - Tests now use `bash` on Windows. (#381)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3009be6f..ed6c5195a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -660,10 +660,11 @@ install(
 install(
     TARGETS h3
     EXPORT "${TARGETS_EXPORT_NAME}"
+    COMPONENT libh3
     LIBRARY DESTINATION "lib"
     ARCHIVE DESTINATION "lib"
     RUNTIME DESTINATION "bin"
-    COMPONENT libh3
+    INCLUDES DESTINATION "${include_install_dir}"
 )
 
 # Headers:

From 5c60a426b89c7b804f2d1f2e449baa866e7a3889 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@isaacbrodsky.com>
Date: Sun, 23 Aug 2020 15:21:46 -0700
Subject: [PATCH 23/23] Update badges

---
 .github/workflows/{test-osx.yml => test-macos.yml} | 2 +-
 .travis.yml                                        | 2 --
 README.md                                          | 5 +++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename .github/workflows/{test-osx.yml => test-macos.yml} (97%)

diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-macos.yml
similarity index 97%
rename from .github/workflows/test-osx.yml
rename to .github/workflows/test-macos.yml
index 983b67080..4474fab8c 100644
--- a/.github/workflows/test-osx.yml
+++ b/.github/workflows/test-macos.yml
@@ -1,4 +1,4 @@
-name: test-osx
+name: test-macos
 
 on:
   push:
diff --git a/.travis.yml b/.travis.yml
index 7507d1146..5e9fbe939 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,8 +59,6 @@ matrix:
         - yarn build
         - cd ..
         - 'if [ -n "$FOSSA_API_KEY" ]; then fossa; fi'
-    - name: "Mac OSX (Xcode 8)"
-      os: osx
     - name: "ARM64"
       arch: arm64
 
diff --git a/README.md b/README.md
index daa7b52a8..09a95091b 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,9 @@
 
 # H3: A Hexagonal Hierarchical Geospatial Indexing System
 
-[![Build Status](https://travis-ci.com/uber/h3.svg?branch=master)](https://travis-ci.com/uber/h3)
-[![Build status](https://ci.appveyor.com/api/projects/status/61431y4sc5w0tsuk/branch/master?svg=true)](https://ci.appveyor.com/project/Uber/h3/branch/master)
+[![test-linux](https://github.com/uber/h3/workflows/test-linux/badge.svg)](https://github.com/uber/h3/actions)
+[![test-macos](https://github.com/uber/h3/workflows/test-macos/badge.svg)](https://github.com/uber/h3/actions)
+[![test-windows](https://github.com/uber/h3/workflows/test-windows/badge.svg)](https://github.com/uber/h3/actions)
 [![Coverage Status](https://coveralls.io/repos/github/uber/h3/badge.svg?branch=master)](https://coveralls.io/github/uber/h3?branch=master)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)