diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..763e473
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+## Summary
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Details
+<!--- Describe your changes in detail -->
+
+## Checklist before merging
+- [ ] If this is a new feature or a bug fix, I have added tests.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 21ae770..429ba86 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -10,13 +10,32 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
+  build_and_test:
 
-    runs-on: macos-latest
+    # TODO: once https://github.com/swift-actions/setup-swift/pull/684 is merged, revert to:
+
+    # runs-on: macos-latest
+    # steps:
+    # - uses: swift-actions/setup-swift@v2
+    # with:
+    #   swift-version: "6.0.1"
+
+    runs-on: macos-15
 
     steps:
+    - name: Get swift version
+      run: swift --version
     - uses: actions/checkout@v4
     - name: Build
-      run: swift build -v
+      run: swift build -q
     - name: Run tests
-      run: swift test -v
+      run: swift test -q
+
+  lint:
+    runs-on: macos-15
+    steps:
+    - uses: actions/checkout@v4
+    - name: Run linter
+      run: swift package --allow-writing-to-package-directory format
+    - name: Verify that `swift package --allow-writing-to-package-directory format` did not change outputs (if it did, please re-run it and re-commit!)
+      run: git diff --exit-code