diff --git a/.github/workflows/cli_setup.yml b/.github/workflows/cli_setup.yml index df11b19..66b6a5e 100644 --- a/.github/workflows/cli_setup.yml +++ b/.github/workflows/cli_setup.yml @@ -24,20 +24,8 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install Python dependencies - run: | - python3 -m pip install wheel - echo "$HOME/.local/bin" >> $GITHUB_PATH - - - name: Install QMK CLI from source - run: | - python3 -m pip install -r requirements.txt - python3 setup.py sdist bdist_wheel - cd .. - python3 -m pip install --force-reinstall --no-index --no-deps --prefix=~/.local --find-links qmk_cli/dist qmk - - - name: Run qmk setup -y - run: qmk setup -y + - name: Run ci_tests + run: ./ci_tests -a test_cli_win: runs-on: windows-latest @@ -53,19 +41,6 @@ jobs: update: true install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip - - name: (MSYS2) Install Python dependencies + - name: (MSYS2) Run ci_tests -a shell: msys2 {0} - run: | - python3 -m pip install wheel - - - name: (MSYS2) Install QMK CLI from source - shell: msys2 {0} - run: | - python3 -m pip install -r requirements.txt - python3 setup.py sdist bdist_wheel - cd .. - python3 -m pip install --force-reinstall --no-index --no-deps --find-links qmk_cli/dist qmk - - - name: (MSYS2) Run qmk setup -y - shell: msys2 {0} - run: qmk setup -y + run: ./ci_tests -a diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 9497d7e..b8bd042 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -22,6 +22,8 @@ jobs: uses: actions/setup-python@v2.2.2 with: python-version: '3.7' + - name: Run ci_tests + run: ./ci_tests - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/ci_tests b/ci_tests index 94798b9..a155fbc 100755 --- a/ci_tests +++ b/ci_tests @@ -29,7 +29,8 @@ python3 -m venv .ci_venv source .ci_venv/bin/activate # Install dependencies -pip3 install -e . +pip3 install wheel +pip3 install . pip3 install -r requirements-dev.txt # Ensure that qmk works