From 0ee4b1dcb7372b877afac9251f25a1e6856f0fb0 Mon Sep 17 00:00:00 2001 From: kta-intel Date: Wed, 30 Oct 2024 12:50:23 -0700 Subject: [PATCH 1/4] fix workflows Signed-off-by: kta-intel --- .github/workflows/lint.yml | 2 +- .github/workflows/pytest_coverage.yml | 2 +- .github/workflows/task_runner_custom_weighted_average.yml | 2 +- .github/workflows/task_runner_skc_compression.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9ccba39..fc76557 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,7 +5,7 @@ name: Lint with Flake8 on: pull_request: - branches: [ develop ] + branches: [ main ] permissions: contents: read diff --git a/.github/workflows/pytest_coverage.yml b/.github/workflows/pytest_coverage.yml index ce2a7f6..2343ad8 100644 --- a/.github/workflows/pytest_coverage.yml +++ b/.github/workflows/pytest_coverage.yml @@ -5,7 +5,7 @@ name: Pytest and code coverage on: pull_request: - branches: [ develop ] + branches: [ main ] permissions: contents: read diff --git a/.github/workflows/task_runner_custom_weighted_average.yml b/.github/workflows/task_runner_custom_weighted_average.yml index 0deec9d..6d9e845 100644 --- a/.github/workflows/task_runner_custom_weighted_average.yml +++ b/.github/workflows/task_runner_custom_weighted_average.yml @@ -5,7 +5,7 @@ name: Task Runner with Median Aggregation on: pull_request: - branches: [ develop ] + branches: [ main ] permissions: contents: read diff --git a/.github/workflows/task_runner_skc_compression.yml b/.github/workflows/task_runner_skc_compression.yml index 7653aec..9a777b3 100644 --- a/.github/workflows/task_runner_skc_compression.yml +++ b/.github/workflows/task_runner_skc_compression.yml @@ -5,7 +5,7 @@ name: Task Runner with SKC Compression on: pull_request: - branches: [ develop ] + branches: [ main ] permissions: contents: read From 7ec8c74d024acc6b0138e570cbfb0b3325b48d43 Mon Sep 17 00:00:00 2001 From: kta-intel Date: Wed, 30 Oct 2024 12:57:36 -0700 Subject: [PATCH 2/4] fqdn length fix Signed-off-by: kta-intel --- .github/workflows/task_runner_custom_weighted_average.yml | 4 ++++ .github/workflows/task_runner_skc_compression.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/task_runner_custom_weighted_average.yml b/.github/workflows/task_runner_custom_weighted_average.yml index 6d9e845..f458e97 100644 --- a/.github/workflows/task_runner_custom_weighted_average.yml +++ b/.github/workflows/task_runner_custom_weighted_average.yml @@ -10,6 +10,10 @@ on: permissions: contents: read +env: + # A workaround for long FQDN names provided by GitHub actions. + FQDN: "localhost" + jobs: build: strategy: diff --git a/.github/workflows/task_runner_skc_compression.yml b/.github/workflows/task_runner_skc_compression.yml index 9a777b3..dddc252 100644 --- a/.github/workflows/task_runner_skc_compression.yml +++ b/.github/workflows/task_runner_skc_compression.yml @@ -10,6 +10,10 @@ on: permissions: contents: read +env: + # A workaround for long FQDN names provided by GitHub actions. + FQDN: "localhost" + jobs: build: strategy: From 240ec94a4e8f676d6406b78331c484971c5ff74e Mon Sep 17 00:00:00 2001 From: kta-intel Date: Wed, 30 Oct 2024 13:17:15 -0700 Subject: [PATCH 3/4] acquire fqdn from env Signed-off-by: kta-intel --- tests/github/test_task_runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/github/test_task_runner.py b/tests/github/test_task_runner.py index a69f065..e56a9ea 100644 --- a/tests/github/test_task_runner.py +++ b/tests/github/test_task_runner.py @@ -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 @@ -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 From d688a0b21cac20d54c81ec4d9c763b96d878dd29 Mon Sep 17 00:00:00 2001 From: kta-intel Date: Wed, 30 Oct 2024 14:01:24 -0700 Subject: [PATCH 4/4] pause windows-latest workflow Signed-off-by: kta-intel --- .github/workflows/task_runner_custom_weighted_average.yml | 2 +- .github/workflows/task_runner_skc_compression.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/task_runner_custom_weighted_average.yml b/.github/workflows/task_runner_custom_weighted_average.yml index f458e97..5eaf979 100644 --- a/.github/workflows/task_runner_custom_weighted_average.yml +++ b/.github/workflows/task_runner_custom_weighted_average.yml @@ -18,7 +18,7 @@ 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: diff --git a/.github/workflows/task_runner_skc_compression.yml b/.github/workflows/task_runner_skc_compression.yml index dddc252..08bd8f6 100644 --- a/.github/workflows/task_runner_skc_compression.yml +++ b/.github/workflows/task_runner_skc_compression.yml @@ -18,7 +18,7 @@ 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: