From 884f0f0c190ced2006d63e87556b097e3585558f Mon Sep 17 00:00:00 2001
From: John Strunk <john.strunk@gmail.com>
Date: Wed, 3 Apr 2024 15:07:27 +0000
Subject: [PATCH] Add act, upgrade actions to py 3.12

Signed-off-by: John Strunk <john.strunk@gmail.com>
---
 .devcontainer/devcontainer.json   |  2 ++
 .github/workflows/pre-commit.yaml | 17 ++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 82e79c2..cf644a1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,8 +6,10 @@
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2.10.2": {},
 		"ghcr.io/devcontainers/features/github-cli:1.0.11": {},
 		"ghcr.io/devcontainers/features/node:1.4.1": {},
+		"ghcr.io/devcontainers-contrib/features/act:1.0.14": {},
 		"ghcr.io/devcontainers-contrib/features/pipenv:2.0.17": {},
 		"ghcr.io/devcontainers-contrib/features/pre-commit:2.0.17": {}
 	},
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index 9df5a51..41a6346 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -22,12 +22,12 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Set up Python
-        id: py-pc
+        id: setup-py
         # https://github.com/actions/setup-python
         # yamllint disable-line rule:line-length
         uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Enable cache for pre-commit hooks
         # https://github.com/actions/cache
@@ -35,18 +35,13 @@ jobs:
         with:
           path: ~/.cache/pre-commit
           # yamllint disable-line rule:line-length
-          key: pre-commit|${{ steps.py-pc.outputs.python-version}}|${{ hashFiles('.pre-commit-config.yaml') }}
+          key: pre-commit|${{ steps.setup-py.outputs.python-version}}|${{ hashFiles('.pre-commit-config.yaml') }}
           restore-keys: |
-            pre-commit|${{ steps.py-pc.outputs.python-version}}|
+            pre-commit|${{ steps.setup-py.outputs.python-version}}|
             pre-commit|
 
-      - name: Install pre-commit
-        run: |
-          pip install --upgrade pre-commit
-          pre-commit --version
-
       - name: Run pre-commit checks
-        run: pre-commit run -a
+        run: pipx run pre-commit run -a
 
       - name: Run pre-commit gc
-        run: pre-commit gc
+        run: pipx run pre-commit gc