From 0ce3f606bcfea8849c664cf55ee2496c8da65e5b Mon Sep 17 00:00:00 2001
From: Qing Wang <kingchin1218@gmail.com>
Date: Tue, 11 Jul 2023 22:25:48 +0800
Subject: [PATCH] Support github matrix workflow for many rays (#148)

---------

Signed-off-by: Qing Wang <kingchin1218@gmail.com>
---
 .github/workflows/test_on_ray2.4.0.yml        | 38 -------------------
 ...2.0.0.yml => unit_tests_on_ray_matrix.yml} | 13 +++++--
 README.md                                     |  8 ++--
 3 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/test_on_ray2.4.0.yml
 rename .github/workflows/{test_on_ray2.0.0.yml => unit_tests_on_ray_matrix.yml} (72%)

diff --git a/.github/workflows/test_on_ray2.4.0.yml b/.github/workflows/test_on_ray2.4.0.yml
deleted file mode 100644
index 11b0a3c..0000000
--- a/.github/workflows/test_on_ray2.4.0.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: test on ray2.4.0
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  run-unit-tests:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    container: docker.io/library/ubuntu:latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install basic dependencies
-      run:  |
-            apt-get update
-            apt-get install -yq wget gcc g++ python3.9 zlib1g-dev zip libuv1.dev
-            apt-get install -yq pip
-
-    - name: Install python dependencies
-      run:  |
-            python3 -m pip install virtualenv
-            python3 -m virtualenv -p python3 py3
-            . py3/bin/activate
-            which python
-            pip install pytest torch cloudpickle cryptography
-            pip install "protobuf<4.0"
-            pip install ray==2.4.0
-
-    - name: Build and test
-      run: |
-           . py3/bin/activate
-           pip install -e . -v
-           sh test.sh
diff --git a/.github/workflows/test_on_ray2.0.0.yml b/.github/workflows/unit_tests_on_ray_matrix.yml
similarity index 72%
rename from .github/workflows/test_on_ray2.0.0.yml
rename to .github/workflows/unit_tests_on_ray_matrix.yml
index 992435a..20eb9a5 100644
--- a/.github/workflows/test_on_ray2.0.0.yml
+++ b/.github/workflows/unit_tests_on_ray_matrix.yml
@@ -1,4 +1,4 @@
-name: test on ray2.0.0
+name: test on many rays
 
 on:
   push:
@@ -7,7 +7,12 @@ on:
     branches: [ main ]
 
 jobs:
-  run-unit-tests:
+  run-unit-tests-on-many-rays:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        ray_version: [2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0]
+
     timeout-minutes: 60
     runs-on: ubuntu-latest
     container: docker.io/library/ubuntu:latest
@@ -28,7 +33,9 @@ jobs:
             . py3/bin/activate
             which python
             pip install pytest torch cloudpickle cryptography
-            pip install ray==2.0.0
+            # six is required in ray-2.1.0
+            pip install "protobuf<4.0" six
+            pip install ray==${{ matrix.ray_version }}
 
     - name: Build and test
       run: |
diff --git a/README.md b/README.md
index 517730e..6adb8e2 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,10 @@ The code view in each party is exactly the same, but the execution differs based
 
 
 ## Supported Ray Versions
-| RayFed Versions | ray-1.13.0 | ray-2.0.0 | ray-2.1.0 | ray-2.2.0 | ray-2.3.0 |
-|:---------------:|:--------:|:--------:|:--------:|:--------:|:--------:|
-| 0.1.0           |✅      | ✅      | ✅      | ✅      | ❌      |
-| 0.2.0           |not released|not released|not released|not released|not released|
+| RayFed Versions | ray-1.13.0 | ray-2.0.0 | ray-2.1.0 | ray-2.2.0 | ray-2.3.0 | ray-2.4.0 |
+|:---------------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|
+| 0.1.0           |✅      | ✅      | ✅      | ✅      | ✅      | ✅      |
+| 0.2.0           |not released|not released|not released|not released|not released|not released|
 
 
 ## Installation