Merge 2e80b44 into 79cf618

.dockerignore

@@ -1,2 +1,3 @@
+/.idea
 /target
-/tiles
+/tiles

.github/workflows/ci.yml

@@ -1,16 +1,14 @@
-name: Lint, test, and publish
+name: Lint and test
 
 on:
   push:
     branches:
-      - develop
-  release:
-    types: [published]
+      - main
+  pull_request:
 
 jobs:
   tests:
     runs-on: ubuntu-latest
-    if: github.event_name != 'release'
     strategy:
       matrix:
         rust:
@@ -25,11 +23,22 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
           components: rustfmt, clippy
-      - uses: actions-rs/cargo@v1
+      - name: Formatting (fmt)
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+      - name: Clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+      - name: Test
+        uses: actions-rs/cargo@v1
         with:
           command: test
-  
-  coverage_and_publish:
+
+  coverage:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -49,44 +58,3 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           path-to-lcov: './lcov.info'
-      - name: Publish to crates.io
-        if: github.event_name == 'release'
-        uses: actions-rs/cargo@v1
-        with:
-          command: publish
-          args: --token ${{ secrets.CRATES_TOKEN }}
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    if: github.event_name != 'release'
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    if: github.event_name != 'release'
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
-

.github/workflows/publish.yml

@@ -0,0 +1,35 @@
+name: Publish to crates.io
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  coverage_and_publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+        # TODO: On publish, do we need to run these two coverage steps?
+      - name: Generate coverage info
+        uses: actions-rs/tarpaulin@v0.1
+        with:
+          version: '0.18.0'
+          args: '-- --test-threads 1'
+          out-type: 'Lcov'
+      - name: Upload to coveralls.io
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          path-to-lcov: './lcov.info'
+      - name: Publish to crates.io
+        if: github.event_name == 'release'
+        uses: actions-rs/cargo@v1
+        with:
+          command: publish
+          args: --token ${{ secrets.CRATES_TOKEN }}

.gitignore

@@ -1,3 +1,4 @@
+/.idea
 /target
 **/*.rs.bk