Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trigger workflows on pull request to main #4

Merged
merged 4 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Lint with Flake8

on:
pull_request:
branches: [ develop ]
branches: [ main ]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Pytest and code coverage

on:
pull_request:
branches: [ develop ]
branches: [ main ]

permissions:
contents: read
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/task_runner_custom_weighted_average.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@ name: Task Runner with Median Aggregation

on:
pull_request:
branches: [ develop ]
branches: [ main ]

permissions:
contents: read

env:
# A workaround for long FQDN names provided by GitHub actions.
FQDN: "localhost"

jobs:
build:
strategy:
matrix:
os: ['ubuntu-latest', 'windows-latest']
os: ['ubuntu-latest']
python-version: ['3.8','3.9','3.10','3.11']
runs-on: ${{ matrix.os }}
steps:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/task_runner_skc_compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@ name: Task Runner with SKC Compression

on:
pull_request:
branches: [ develop ]
branches: [ main ]

permissions:
contents: read

env:
# A workaround for long FQDN names provided by GitHub actions.
FQDN: "localhost"

jobs:
build:
strategy:
matrix:
os: ['ubuntu-latest', 'windows-latest']
os: ['ubuntu-latest']
python-version: ['3.8','3.9','3.10','3.11']
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions tests/github/test_task_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from subprocess import check_call
from concurrent.futures import ProcessPoolExecutor

from openfl.utilities.utils import rmtree
from openfl.utilities.utils import rmtree, getfqdn_env
from tests.github.utils import create_collaborator, initialize_and_certify_workspace, certify_aggregator


Expand All @@ -28,7 +28,7 @@
args = parser.parse_args()
workspace = args.workspace
archive_name = f'{workspace}.zip'
fqdn = socket.getfqdn()
fqdn = getfqdn_env()
rounds_to_train = args.rounds_to_train
col1, col2 = args.col1, args.col2
col1_data_path, col2_data_path = args.col1_data_path, args.col2_data_path
Expand Down
Loading