Merge branch 'securefederatedai:main' into lint-fix

securefederatedai · Oct 30, 2024 · ff622ce · ff622ce
2 parents db9c951 + 527fc86
commit ff622ce
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ name: Check code format
 
 on:
   pull_request:
-    branches: [ develop ]
+    branches: [ main ]
 
 permissions:
   contents: read

diff --git 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
@@ -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:

diff --git a/.github/workflows/task_runner_skc_compression.yml b/.github/workflows/task_runner_skc_compression.yml
@@ -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:

diff --git 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