From 29ed1977737eac8add285ccd49be9fa737669c89 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:04:36 -0500 Subject: [PATCH 1/8] Collapse code quality workflow to one job/VM --- .github/workflows/code-quality.yml | 59 +++--------------------------- 1 file changed, 5 insertions(+), 54 deletions(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 5d0d2f3..50e1781 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -14,8 +14,8 @@ permissions: contents: read jobs: - formatting: - name: Code Formatting + code-quality: + name: Code Quality runs-on: ubuntu-latest steps: @@ -41,62 +41,13 @@ jobs: run: uv sync - name: Check code formatting + if: always() run: uv run invoke format-check - linting: - name: Linting - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Install uv - run: | - curl -LsSf https://astral.sh/uv/install.sh | sh - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - shell: bash - - - name: Configure Git for private repos - run: | - git config --global url."https://x-access-token:${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/".insteadOf "https://github.com/" - - - name: Install dependencies - run: uv sync - - name: Check linting + if: always() run: uv run invoke lint-check - type-checking: - name: Type Checking - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Install uv - run: | - curl -LsSf https://astral.sh/uv/install.sh | sh - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - shell: bash - - - name: Configure Git for private repos - run: | - git config --global url."https://x-access-token:${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/".insteadOf "https://github.com/" - - - name: Install dependencies - run: uv sync - - name: Check type hints + if: always() run: uv run invoke mypy-check From 0de553be456afd8200ed7af0db315dda7ffa9fb8 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:07:00 -0500 Subject: [PATCH 2/8] Rename job to specify sub component of code quality --- .github/workflows/code-quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 50e1781..77d28b9 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -15,7 +15,7 @@ permissions: jobs: code-quality: - name: Code Quality + name: Lint & Type Check runs-on: ubuntu-latest steps: From 74a0e42cd83f3003fd6145f04afad52ff68d1f7f Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:09:24 -0500 Subject: [PATCH 3/8] Install uv with setup naturally instead --- .github/workflows/code-quality.yml | 5 +---- .github/workflows/sync-docs.yml | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 77d28b9..9961110 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -28,10 +28,7 @@ jobs: python-version: '3.11' - name: Install uv - run: | - curl -LsSf https://astral.sh/uv/install.sh | sh - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - shell: bash + uses: astral-sh/setup-uv@v3 - name: Configure Git for private repos run: | diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml index 842a9a5..a056a21 100644 --- a/.github/workflows/sync-docs.yml +++ b/.github/workflows/sync-docs.yml @@ -19,9 +19,7 @@ jobs: python-version: '3.11' - name: Install uv - run: | - curl -LsSf https://astral.sh/uv/install.sh | sh - echo "$HOME/.cargo/bin" >> $GITHUB_PATH + uses: astral-sh/setup-uv@v3 - name: Configure Git for private repos run: | From 155c5557d203baab8446905a495d27054d717b32 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:21:56 -0500 Subject: [PATCH 4/8] Remove python installation since uv handles python installation --- .github/workflows/code-quality.yml | 5 ----- .github/workflows/sync-docs.yml | 5 ----- .github/workflows/tests-macos.yml | 5 ----- .github/workflows/tests-ubuntu.yml | 5 ----- .github/workflows/tests-windows.yml | 5 ----- 5 files changed, 25 deletions(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 9961110..cbbda17 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -22,11 +22,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install uv uses: astral-sh/setup-uv@v3 diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml index a056a21..675376c 100644 --- a/.github/workflows/sync-docs.yml +++ b/.github/workflows/sync-docs.yml @@ -13,11 +13,6 @@ jobs: - name: Checkout voxkit-desktop repository uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install uv uses: astral-sh/setup-uv@v3 diff --git a/.github/workflows/tests-macos.yml b/.github/workflows/tests-macos.yml index 28f8cab..7ff7607 100644 --- a/.github/workflows/tests-macos.yml +++ b/.github/workflows/tests-macos.yml @@ -19,11 +19,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install uv uses: astral-sh/setup-uv@v3 diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index 3e933f0..cd330cc 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -19,11 +19,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install Qt system dependencies run: | sudo apt-get update diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml index 13d4bf8..70c45dc 100644 --- a/.github/workflows/tests-windows.yml +++ b/.github/workflows/tests-windows.yml @@ -19,11 +19,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install uv uses: astral-sh/setup-uv@v3 From e3d52261265030f67acc94751495636d1a5fd093 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:25:26 -0500 Subject: [PATCH 5/8] Remove soft code quality assurance in ubuntu test workflow --- .github/workflows/tests-ubuntu.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index cd330cc..fe195ee 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -56,13 +56,3 @@ jobs: - name: Run tests run: | xvfb-run -a uv run invoke run-tests - - - name: Run linting - run: | - uv run invoke lint-check - continue-on-error: true - - - name: Run type checking - run: | - uv run invoke mypy-check - continue-on-error: true From 14cc83ba4436cd0cc6a28bb5b5f57799c4053fb9 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:28:07 -0500 Subject: [PATCH 6/8] Enable caching for uv across jobs --- .github/workflows/code-quality.yml | 2 ++ .github/workflows/sync-docs.yml | 2 ++ .github/workflows/tests-macos.yml | 2 ++ .github/workflows/tests-ubuntu.yml | 2 ++ .github/workflows/tests-windows.yml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index cbbda17..d5687bd 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -24,6 +24,8 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v3 + with: + enable-cache: true - name: Configure Git for private repos run: | diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml index 675376c..422bebb 100644 --- a/.github/workflows/sync-docs.yml +++ b/.github/workflows/sync-docs.yml @@ -15,6 +15,8 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v3 + with: + enable-cache: true - name: Configure Git for private repos run: | diff --git a/.github/workflows/tests-macos.yml b/.github/workflows/tests-macos.yml index 7ff7607..375cee7 100644 --- a/.github/workflows/tests-macos.yml +++ b/.github/workflows/tests-macos.yml @@ -21,6 +21,8 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v3 + with: + enable-cache: true - name: Configure Git for private repos run: | diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index fe195ee..319cc62 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -44,6 +44,8 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v3 + with: + enable-cache: true - name: Configure Git for private repos run: | diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml index 70c45dc..35af941 100644 --- a/.github/workflows/tests-windows.yml +++ b/.github/workflows/tests-windows.yml @@ -21,6 +21,8 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v3 + with: + enable-cache: true - name: Configure Git for private repos run: | From 3f49ea6116a9c3abc3a5e44b587480b9658e0470 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Wed, 13 May 2026 10:34:21 -0500 Subject: [PATCH 7/8] Switchng to develop instead of release --- .github/workflows/code-quality.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index d5687bd..7e0c5de 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -4,11 +4,11 @@ on: push: branches: - main - - release + - develop pull_request: branches: - main - - release + - develop permissions: contents: read From 7740d8f4b5f3986f30ed4ef3525053f2e636dce5 Mon Sep 17 00:00:00 2001 From: Beckett Frey Date: Tue, 19 May 2026 08:16:59 -0700 Subject: [PATCH 8/8] Add testing jobs in working branch develop --- .github/workflows/tests-macos.yml | 2 ++ .github/workflows/tests-ubuntu.yml | 2 ++ .github/workflows/tests-windows.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/tests-macos.yml b/.github/workflows/tests-macos.yml index 375cee7..4db3fbc 100644 --- a/.github/workflows/tests-macos.yml +++ b/.github/workflows/tests-macos.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - develop pull_request: branches: - main + - develop permissions: contents: read diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index 319cc62..2126f5d 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - develop pull_request: branches: - main + - develop permissions: contents: read diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml index 35af941..edbe030 100644 --- a/.github/workflows/tests-windows.yml +++ b/.github/workflows/tests-windows.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - develop pull_request: branches: - main + - develop permissions: contents: read