diff --git a/.github/workflows/generate_files.yml b/.github/workflows/generate_files.yml
new file mode 100644
index 0000000000..0723edbd8d
--- /dev/null
+++ b/.github/workflows/generate_files.yml
@@ -0,0 +1,20 @@
+name: Generate Files
+
+# After any push to the main branch, re-generate pregenerated files.
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  generate:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Merge generated branch with main
+        run: cd ${{ github.workspace} && (git checkout generated || git checkout -b generated) && git merge --no-edit main
+      - name: Rebuild generated CMake files
+        run: cd ${{ github.workspace }} && bazel test cmake:test_generated_files || bazel-bin/cmake/test_generated_files --fix
+      - name: Commit and push changes to generated files
+        run: cd ${{ github.workspace }} && git add -A && git diff --staged --quiet || (git commit -am "Regenerated files" && git push)
diff --git a/.gitignore b/.gitignore
index 91ccf906c4..79d6c53f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 obj/
 lib/
 bazel-*
+_build
+.vscode