From 7c19c6d9a41a3d86d10d56e4e910ddb91e81d46f Mon Sep 17 00:00:00 2001 From: zvecr Date: Mon, 24 Jun 2024 06:01:41 +0100 Subject: [PATCH] bodge? --- .github/workflows/cli_setup.yml | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/.github/workflows/cli_setup.yml b/.github/workflows/cli_setup.yml index 739f422..465e688 100644 --- a/.github/workflows/cli_setup.yml +++ b/.github/workflows/cli_setup.yml @@ -7,49 +7,49 @@ on: 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 - env: - QMK_HOME: ~/qmk_firmware + # env: + # QMK_HOME: ~/qmk_firmware - steps: - - uses: actions/checkout@v4 + # steps: + # - uses: actions/checkout@v4 - - 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 -a - test_cli_linux_macos: - needs: test_cli_base_container + # test_cli_linux_macos: + # needs: test_cli_base_container - runs-on: ${{ matrix.os }} - env: - QMK_HOME: ~/qmk_firmware - strategy: - matrix: - os: [macos-latest, ubuntu-latest] - python-version: ['3.9', '3.10', '3.11', '3.12'] - include: - - os: macos-13 - python-version: '3.9' + # runs-on: ${{ matrix.os }} + # env: + # QMK_HOME: ~/qmk_firmware + # strategy: + # matrix: + # os: [macos-latest, ubuntu-latest] + # python-version: ['3.9', '3.10', '3.11', '3.12'] + # include: + # - os: macos-13 + # python-version: '3.9' - steps: - - uses: actions/checkout@v4 + # steps: + # - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v5 + # with: + # python-version: ${{ matrix.python-version }} - - name: Run ci_tests - run: ./ci_tests -a + # - name: Run ci_tests + # run: ./ci_tests -a test_cli_win: - needs: test_cli_base_container + # needs: test_cli_base_container runs-on: windows-latest env: @@ -62,16 +62,15 @@ jobs: 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-pillow mingw-w64-x86_64-rust + 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 - - name: (MSYS2) Install Python dependencies - shell: msys2 {0} - run: | - python3 -m pip install -U setuptools wheel + # - name: (MSYS2) Install Python dependencies + # shell: msys2 {0} + # run: | + # python3 -m pip install -U setuptools wheel - name: (MSYS2) Install QMK CLI from source shell: msys2 {0} run: | - python3 -m pip install -U build python3 -m build python3 -m pip install dist/qmk-*.tar.gz - name: (MSYS2) Run qmk setup -y