diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 218ce61..ae563bc 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -9,6 +9,10 @@ on:
     tags:
     - '*'
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -49,13 +53,38 @@ jobs:
         pip --disable-pip-version-check install -e .
         pip --disable-pip-version-check install -r docs/requirements.txt
         cd docs && make clean html SPHINXOPTS="-W --keep-going"
-  
+
+  #
+  # Build a wheel
+  #
+
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    - uses: actions/setup-python@v4
+      with:
+        python-version: 3.8
+
+    - run: pipx run build
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: dist
+        path: dist
+
   test:
+    needs: [build]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-20.04]
-        python_version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python_version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
         architecture: [x86, x64]
         exclude:
         - os: macos-latest
@@ -74,14 +103,14 @@ jobs:
         python-version: ${{ matrix.python_version }}
         architecture: ${{ matrix.architecture }}
 
-    - name: Install build dependencies
-      run: python -m pip --disable-pip-version-check install wheel
-
-    - name: Build wheel
-      run: python setup.py bdist_wheel
+    - name: Download build artifacts
+      uses: actions/download-artifact@v3
+      with:
+        name: dist
+        path: dist
     
     - name: Install test dependencies
-      run: python -m pip --disable-pip-version-check install pytest pcpp
+      run: python -m pip --disable-pip-version-check install -r tests/requirements.txt
     
     - name: Test wheel
       shell: bash
@@ -94,23 +123,16 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     needs: [check, check-mypy, check-doc, test]
+    permissions:
+      id-token: write
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Download build artifacts
+      uses: actions/download-artifact@v3
       with:
-        submodules: recursive
-        fetch-depth: 0
-    
-    - uses: actions/setup-python@v4
-      with:
-        python-version: 3.8
-    - run: pip --disable-pip-version-check install wheel
+        name: dist
+        path: dist
 
-    - name: Build packages
-      run: python setup.py sdist bdist_wheel
     - name: Publish to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_PASSWORD }}
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/README.md b/README.md
index e764b87..81c794e 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 cxxheaderparser
 ===============
 
-**Note**: This is still a work in progress, but should be stable ~in a few weeks~
-once I port robotpy-build over to use it. Someday I'll do that, probably!
-
 A pure python C++ header parser that parses C++ headers in a mildly naive
 manner that allows it to handle many C++ constructs, including many modern
 (C++11 and beyond) features.
@@ -54,7 +51,9 @@ Install
 
 Requires Python 3.6+, no non-stdlib dependencies if using Python 3.7+.
 
-TODO: distribute on pip
+```
+pip install cxxheaderparser
+```
 
 Usage
 -----
diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000..cf73327
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1,2 @@
+pytest
+pcpp~=1.30
\ No newline at end of file