From edb6ca364e962ce678a75dae35496cf103ceb873 Mon Sep 17 00:00:00 2001 From: umarcor Date: Sun, 9 Jan 2022 19:40:20 +0100 Subject: [PATCH 1/2] UnitTesting/msys2: install system packages through 'pacboy' --- .github/workflows/UnitTesting.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index 7b6158e..cab9716 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -70,7 +70,11 @@ jobs: with: msystem: MINGW64 update: true - pacboy: python-pip:p + pacboy: >- + python-pip:p + python-wheel:p + python-coverage:p + python-lxml:p - name: 🐍 Setup Python ${{ matrix.python }} if: matrix.system != 'msys2' @@ -87,9 +91,6 @@ jobs: - name: 🔧 Install dependencies if: matrix.system == 'msys2' run: | - pacman -S --noconfirm mingw64/mingw-w64-x86_64-python-wheel - pacman -S --noconfirm mingw64/mingw-w64-x86_64-python-coverage - pacman -S --noconfirm mingw64/mingw-w64-x86_64-python-lxml python -m pip install -U pip python -m pip install ${{ inputs.requirements }} From b3d8a9c5ec16686da46505b22de1a1a902eb064c Mon Sep 17 00:00:00 2001 From: umarcor Date: Sun, 9 Jan 2022 19:49:20 +0100 Subject: [PATCH 2/2] UnitTesting: refactor --- .github/workflows/UnitTesting.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index cab9716..f2cb927 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -82,17 +82,16 @@ jobs: with: python-version: ${{ matrix.python }} - - name: 🔧 Install dependencies + - name: ⚙️ Update pip + run: python -m pip install -U pip + + - name: ⚙️ Install wheel if: matrix.system != 'msys2' run: | - python -m pip install -U pip wheel - python -m pip install ${{ inputs.requirements }} + python -m pip install -U wheel - name: 🔧 Install dependencies - if: matrix.system == 'msys2' - run: | - python -m pip install -U pip - python -m pip install ${{ inputs.requirements }} + run: python -m pip install ${{ inputs.requirements }} - name: ☑ Run unit tests if: matrix.system == 'windows'