From 4c1498ce74d96eb5cfe16189fd5c3f8292b19f75 Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Thu, 4 Apr 2024 14:54:37 +0200 Subject: [PATCH] Revert ci-cd workflow (test win only) --- .github/workflows/ci-cd.yml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index bb095c14..3e4bcad5 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -33,6 +33,31 @@ jobs: git diff --exit-code shell: bash + test-mac: + name: "Test macOS" + uses: "./.github/workflows/test-os.yml" + with: + os: '["macos-11", "macos-12", "macos-13", "macos-14"]' + python-version: '["3.10", "3.11", "3.12", "installed"]' + include: > + [ + {"os": "macos-11", "python-version": "3.7"}, + {"os": "macos-11", "python-version": "3.8"}, + {"os": "macos-11", "python-version": "3.9"}, + {"os": "macos-12", "python-version": "3.8"}, + {"os": "macos-12", "python-version": "3.9"}, + {"os": "macos-13", "python-version": "3.8"}, + {"os": "macos-13", "python-version": "3.9"}, + ] + + test-lnx: + name: "Test Ubuntu" + uses: "./.github/workflows/test-os.yml" + with: + os: '["ubuntu-20.04", "ubuntu-22.04"]' + python-version: '["3.8", "3.9", "3.10", "3.11", "3.12", "installed"]' + include: '[{"os": "ubuntu-20.04", "python-version": "3.7"}]' + test-win: name: "Test Windows" uses: "./.github/workflows/test-os.yml" @@ -43,7 +68,7 @@ jobs: publish: name: "Publish" - needs: [test-win] + needs: [test-mac, test-lnx, test-win] # we run the action from this branch whenever we can (when it runs in our repo's context) if: > ! cancelled() && @@ -57,7 +82,7 @@ jobs: config-deploy: name: Configure Deployment - needs: [test-win] + needs: [test-mac, test-lnx, test-win] # do not build or deploy on forked repositories if: github.repository_owner == 'EnricoMi' runs-on: ubuntu-latest