From e771a068416be851c521b74853beca8f39bd009c Mon Sep 17 00:00:00 2001 From: Cutieguwu Date: Fri, 3 Jul 2026 05:58:22 -0400 Subject: [PATCH] Scrap useless CI. - Also moved ci_tests to ci_tests.sh --- .github/workflows/cli_setup.yml | 168 ++++++++++++------------- .github/workflows/docker-republish.yml | 74 ----------- .github/workflows/python-publish.yml | 104 --------------- .gitignore | 1 + ci_tests => ci_tests.sh | 0 5 files changed, 85 insertions(+), 262 deletions(-) delete mode 100644 .github/workflows/docker-republish.yml delete mode 100644 .github/workflows/python-publish.yml rename ci_tests => ci_tests.sh (100%) diff --git a/.github/workflows/cli_setup.yml b/.github/workflows/cli_setup.yml index ef47463..474531f 100644 --- a/.github/workflows/cli_setup.yml +++ b/.github/workflows/cli_setup.yml @@ -1,116 +1,116 @@ name: CLI Setup on: - push: - branches: - - master - pull_request: + push: + branches: + - master + pull_request: jobs: - test_cli_base_container: - runs-on: ubuntu-latest - container: ghcr.io/qmk/qmk_base_container + test_cli_base_container: + runs-on: ubuntu-latest + container: ghcr.io/qmk/qmk_base_container - steps: - - uses: actions/checkout@v7 + steps: + - uses: actions/checkout@v7 - - name: Install dependencies - run: apt-get update && apt-get install -y python3-venv + - name: Install dependencies + run: apt-get update && apt-get install -y python3-venv - - name: Run ci_tests - run: ./ci_tests -a + - name: Run ci_tests + run: ./ci_tests.sh -a - test_cli_linux_macos: - needs: test_cli_base_container + test_cli_linux_macos: + needs: test_cli_base_container - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-latest, ubuntu-latest] - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] + strategy: + matrix: + os: [macos-latest, ubuntu-latest] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] - steps: - - uses: actions/checkout@v7 + steps: + - uses: actions/checkout@v7 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python-version }} - - name: Run ci_tests - run: ./ci_tests -a + - name: Run ci_tests + run: ./ci_tests.sh -a - test_cli_win: - needs: test_cli_base_container + test_cli_win: + needs: test_cli_base_container - runs-on: windows-latest + runs-on: windows-latest - steps: - - uses: actions/checkout@v7 + steps: + - uses: actions/checkout@v7 - - name: (MSYS2) Setup and install dependencies - uses: msys2/setup-msys2@v2 - with: - update: true - install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-build mingw-w64-x86_64-python-pillow mingw-w64-x86_64-rust mingw-w64-x86_64-python-halo mingw-w64-x86_64-python-nh3 mingw-w64-x86_64-python-rpds-py + - name: (MSYS2) Setup and install dependencies + uses: msys2/setup-msys2@v2 + with: + update: true + install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-build mingw-w64-x86_64-python-pillow mingw-w64-x86_64-rust mingw-w64-x86_64-python-halo mingw-w64-x86_64-python-nh3 mingw-w64-x86_64-python-rpds-py - # Upgrade pip due to msys packaging + pypa/build/pull/736 issues - - name: (MSYS2) Install Python dependencies - shell: msys2 {0} - run: | - python3 -m pip install --break-system-packages --force-reinstall --upgrade pip + # Upgrade pip due to msys packaging + pypa/build/pull/736 issues + - name: (MSYS2) Install Python dependencies + shell: msys2 {0} + run: | + python3 -m pip install --break-system-packages --force-reinstall --upgrade pip - - name: Run ci_tests - shell: msys2 {0} - run: ./ci_tests -a + - name: Run ci_tests + shell: msys2 {0} + run: ./ci_tests.sh -a - test_docker_container: - needs: test_cli_base_container + test_docker_container: + needs: test_cli_base_container - runs-on: ubuntu-latest + runs-on: ubuntu-latest - env: - TEST_TAG: qmkfm/qmk_cli:test + env: + TEST_TAG: qmkfm/qmk_cli:test - steps: - - name: Set up Python - uses: actions/setup-python@v6 - with: - python-version: '3.9' + steps: + - name: Set up Python + uses: actions/setup-python@v6 + with: + python-version: "3.9" - - name: Set up QEMU - uses: docker/setup-qemu-action@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v4 - - uses: actions/checkout@v7 + - uses: actions/checkout@v7 - - name: Install dependencies - run: | - python3 -m pip install --upgrade pip - pip install setuptools wheel - pip install --group dev + - name: Install dependencies + run: | + python3 -m pip install --upgrade pip + pip install setuptools wheel + pip install --group dev - - name: Build Python - run: | - python3 -m build + - name: Build Python + run: | + python3 -m build - - name: Build Test Container - uses: docker/build-push-action@v7 - with: - context: . - load: true - tags: ${{ env.TEST_TAG }} + - name: Build Test Container + uses: docker/build-push-action@v7 + with: + context: . + load: true + tags: ${{ env.TEST_TAG }} - - name: Test - run: | - docker run --rm -v ${{ github.workspace }}:/qmk_cli -w /qmk_cli ${{ env.TEST_TAG }} /qmk_cli/ci_tests -a + - name: Test + run: | + docker run --rm -v ${{ github.workspace }}:/qmk_cli -w /qmk_cli ${{ env.TEST_TAG }} /qmk_cli/ci_tests -a - - name: Build All Containers - uses: docker/build-push-action@v7 - with: - context: . - target: full - platforms: linux/amd64,linux/arm64 + - name: Build All Containers + uses: docker/build-push-action@v7 + with: + context: . + target: full + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/docker-republish.yml b/.github/workflows/docker-republish.yml deleted file mode 100644 index 8610be2..0000000 --- a/.github/workflows/docker-republish.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Rebuild Docker Image - -on: - workflow_dispatch: - -jobs: - redeploy: - - runs-on: ubuntu-latest - - steps: - - name: Set up Python - uses: actions/setup-python@v6 - with: - python-version: '3.9' - - - name: Set up QEMU - uses: docker/setup-qemu-action@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 - - - uses: actions/checkout@v7 - with: - fetch-depth: 0 - - - name: Get Previous tag - id: previoustag - uses: "WyriHaximus/github-action-get-previous-tag@v2" - - - name: Download previous artifact - run: | - pip download -d "${GITHUB_WORKSPACE}/dist" qmk=="${{ steps.previoustag.outputs.tag }}" - - - name: Login to GitHub Container Registry - uses: docker/login-action@v4 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Log in to Docker Hub - uses: docker/login-action@v4 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Build and Push slim to Docker Hub - uses: docker/build-push-action@v7 - with: - context: . - push: true - target: slim - platforms: linux/amd64,linux/arm64 - tags: | - ghcr.io/qmk/qmk_cli:slim - qmkfm/qmk_cli:slim - ghcr.io/qmk/qmk_cli:${{ steps.previoustag.outputs.tag }}-slim - qmkfm/qmk_cli:${{ steps.previoustag.outputs.tag }}-slim - - - name: Build and Push full to Docker Hub - uses: docker/build-push-action@v7 - with: - context: . - push: true - target: full - platforms: linux/amd64,linux/arm64 - tags: | - ghcr.io/qmk/qmk_cli:latest - qmkfm/qmk_cli:latest - ghcr.io/qmk/qmk_cli:${{ github.sha }} - qmkfm/qmk_cli:${{ github.sha }} - ghcr.io/qmk/qmk_cli:${{ steps.previoustag.outputs.tag }} - qmkfm/qmk_cli:${{ steps.previoustag.outputs.tag }} diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml deleted file mode 100644 index 152ede1..0000000 --- a/.github/workflows/python-publish.yml +++ /dev/null @@ -1,104 +0,0 @@ -# This workflow will upload a Python Package using Twine when a release is created -# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries - -name: Upload Python Package - -on: - workflow_dispatch: - inputs: - version_part: - description: 'Which part of the version to increment (patch, minor, major)' - required: true - default: 'patch' - -jobs: - deploy: - - runs-on: ubuntu-latest - - steps: - - name: Set up Python - uses: actions/setup-python@v6 - with: - python-version: '3.9' - - - name: Set up QEMU - uses: docker/setup-qemu-action@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 - - - uses: actions/checkout@v7 - - - name: Run ci_tests - run: ./ci_tests - - - name: Install dependencies - run: | - python3 -m pip install --upgrade pip - pip install setuptools wheel - pip install --group dev - - - name: Bump version - run: | - git config --local user.email "hello@qmk.fm" - git config --local user.name "QMK Bot" - bumpversion --dry-run --list ${{ github.event.inputs.version_part }} | grep new_version= | sed "s/new_version/NEW_CLI_VERSION/" >> "$GITHUB_ENV" - bumpversion ${{ github.event.inputs.version_part }} - - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - tags: true - - - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_APITOKEN }} - run: | - python3 -m build - twine upload dist/* - - - name: Login to GitHub Container Registry - uses: docker/login-action@v4 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Log in to Docker Hub - uses: docker/login-action@v4 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Build and Push slim to Docker Hub - uses: docker/build-push-action@v7 - with: - context: . - push: true - target: slim - platforms: linux/amd64,linux/arm64 - tags: | - ghcr.io/qmk/qmk_cli:slim - qmkfm/qmk_cli:slim - ghcr.io/qmk/qmk_cli:${{ env.NEW_CLI_VERSION }}-slim - qmkfm/qmk_cli:${{ env.NEW_CLI_VERSION }}-slim - - - name: Build and Push full to Docker Hub - uses: docker/build-push-action@v7 - with: - context: . - push: true - target: full - platforms: linux/amd64,linux/arm64 - tags: | - ghcr.io/qmk/qmk_cli:latest - qmkfm/qmk_cli:latest - ghcr.io/qmk/qmk_cli:${{ github.sha }} - qmkfm/qmk_cli:${{ github.sha }} - ghcr.io/qmk/qmk_cli:${{ env.NEW_CLI_VERSION }} - qmkfm/qmk_cli:${{ env.NEW_CLI_VERSION }} - diff --git a/.gitignore b/.gitignore index d0371a1..7daea57 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ wheels/ .installed.cfg *.egg MANIFEST +*.lock # PyInstaller # Usually these files are written by a python script from a template diff --git a/ci_tests b/ci_tests.sh similarity index 100% rename from ci_tests rename to ci_tests.sh