diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 36d7fdc41e..afa5ea6a2f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -25,6 +25,6 @@ jobs: - name: Install linters run: | python -m pip install --upgrade pip - pip install -r linters-requirements.txt + pip install -r linters-requirements.txt - name: Lint with OpenFL-specific rules run: bash scripts/lint.sh diff --git a/.github/workflows/taskrunner.yml b/.github/workflows/taskrunner.yml index a9093be4c1..d003ad8e1c 100644 --- a/.github/workflows/taskrunner.yml +++ b/.github/workflows/taskrunner.yml @@ -17,11 +17,7 @@ env: jobs: build: if: github.event.pull_request.draft == false - strategy: - matrix: - os: ['ubuntu-latest', 'windows-latest'] - python-version: ["3.10", "3.11", "3.12"] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest timeout-minutes: 15 steps: @@ -29,17 +25,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} + python-version: "3.10" - name: Install dependencies ubuntu - if: matrix.os == 'ubuntu-latest' run: | python -m pip install --upgrade pip pip install . - - name: Install dependencies windows - if: matrix.os == 'windows-latest' + - name: Task Runner API run: | - python -m pip install --upgrade pip - pip install . - - name: Test TaskRunner API - run: | - python -m tests.github.test_hello_federation --template keras_cnn_mnist --fed_workspace aggregator --col1 col1 --col2 col2 --rounds-to-train 3 --save-model output_model + python -m tests.github.test_hello_federation --template torch_cnn_mnist --fed_workspace aggregator --col1 collaborator1 --col2 collaborator2 --rounds-to-train 3 --save-model output_model \ No newline at end of file diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index c968e85f11..617c004751 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,6 +13,9 @@ env: jobs: pytest-coverage: # from pytest_coverage.yml + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12"] runs-on: ubuntu-latest timeout-minutes: 15 @@ -21,7 +24,7 @@ jobs: - name: Set up Python 3 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 341b93b7f1..5f3ffa1220 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,14 +13,18 @@ env: jobs: pytest-coverage: # from pytest_coverage.yml + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12"] runs-on: windows-latest timeout-minutes: 15 + steps: - uses: actions/checkout@v3 - name: Set up Python 3 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip