Merge branch 'main' into decouple-client

adap · Oct 13, 2023 · fca2187 · fca2187
2 parents fb8ba3d + 4df413f
commit fca2187
Show file tree

Hide file tree

Showing 422 changed files with 17,414 additions and 1,463 deletions.
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -15,6 +15,7 @@ jobs:
         run:
             working-directory: src/kotlin
     name: Release build and publish
+    if: github.repository == 'adap/flower'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -27,12 +27,16 @@ jobs:
         uses: ./.github/actions/bootstrap
       - name: Install pandoc
         run: sudo apt install pandoc
-      - name: Install dependencies (mandatory only)
+      - name: Install Flower dependencies (mandatory only)
         run: python -m poetry install --extras "simulation"
+      - name: Install Flower Datasets
+        run: |
+          cd datasets
+          python -m poetry install
       - name: Build docs
         run: ./dev/build-docs.sh
       - name: Deploy docs
-        if: github.ref == 'refs/heads/main'
+        if: ${{ github.ref == 'refs/heads/main' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
         env:
           AWS_DEFAULT_REGION: ${{ secrets. AWS_DEFAULT_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: Build, test and upload wheel
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Bootstrap
         uses: ./.github/actions/bootstrap
       - name: Install dependencies (mandatory only)
@@ -30,6 +30,7 @@ jobs:
       - name: Test wheel
         run: ./dev/test-wheel.sh
       - name: Upload wheel
+        if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
         id: upload
         env:
           AWS_DEFAULT_REGION: ${{ secrets. AWS_DEFAULT_REGION }}
@@ -40,10 +41,13 @@ jobs:
           echo "WHL_PATH=$(ls *.whl)" >> "$GITHUB_OUTPUT"
           sha_short=$(git rev-parse --short HEAD)
           echo "SHORT_SHA=$sha_short" >> "$GITHUB_OUTPUT"
-          aws s3 cp --content-disposition "attachment" --cache-control "no-cache" ./ s3://artifact.flower.dev/py/${{ github.head_ref }}/$sha_short --recursive
+          [ -z "${{ github.head_ref }}" ] && dir="${{ github.ref_name }}" || dir="pr/${{ github.head_ref }}"
+          echo "DIR=$dir" >> "$GITHUB_OUTPUT"
+          aws s3 cp --content-disposition "attachment" --cache-control "no-cache" ./ s3://artifact.flower.dev/py/$dir/$sha_short --recursive
     outputs:
       whl_path: ${{ steps.upload.outputs.WHL_PATH }}
       short_sha: ${{ steps.upload.outputs.SHORT_SHA }}
+      dir: ${{ steps.upload.outputs.DIR }}
 
   frameworks:
     runs-on: ubuntu-22.04
@@ -120,8 +124,9 @@ jobs:
       - name: Install dependencies
         run: python -m poetry install
       - name: Install Flower wheel from artifact store
+        if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
         run: |
-          python -m pip install https://artifact.flower.dev/py/${{ github.head_ref }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}
+          python -m pip install https://artifact.flower.dev/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}
       - name: Download dataset
         if: ${{ matrix.dataset }}
         run: python -c "${{ matrix.dataset }}"
@@ -154,8 +159,9 @@ jobs:
         run: |
           python -m poetry install
       - name: Install Flower wheel from artifact store
+        if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
         run: |
-          python -m pip install https://artifact.flower.dev/py/${{ github.head_ref }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}
+          python -m pip install https://artifact.flower.dev/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}
       - name: Cache Datasets
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/flower-swift_sync.yml b/.github/workflows/flower-swift_sync.yml
@@ -12,6 +12,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: github.repository == 'adap/flower'
     steps:
       - uses: actions/checkout@v4
       - name: Pushes src/swift to flower-swift repository

diff --git a/.github/workflows/framework-release.yml b/.github/workflows/framework-release.yml
@@ -0,0 +1,63 @@
+name: Release Framework
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  publish:
+    if: ${{ github.repository == 'adap/flower' }}
+    name: Publish draft
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Wait for wheel to be built
+        uses: lewagon/[email protected]
+        with:
+          ref: ${{ github.ref }}
+          check-name: 'Build, test and upload wheel'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 10
+      - name: Download wheel
+        run: |
+          tag_name=$(echo "${GITHUB_REF_NAME}" | cut -c2-)
+          echo "TAG_NAME=$tag_name" >> "$GITHUB_ENV"
+          
+          wheel_name="flwr-${tag_name}-py3-none-any.whl"
+          echo "WHEEL_NAME=$wheel_name" >> "$GITHUB_ENV"
+          
+          tar_name="flwr-${tag_name}.tar.gz"
+          echo "TAR_NAME=$tar_name" >> "$GITHUB_ENV"
+
+          wheel_url="https://artifact.flower.dev/py/main/${GITHUB_SHA::7}/${wheel_name}"
+          tar_url="https://artifact.flower.dev/py/main/${GITHUB_SHA::7}/${tar_name}"
+          
+          curl $wheel_url --output $wheel_name
+          curl $tar_url --output $tar_name
+      - name: Upload wheel
+        env:
+          AWS_DEFAULT_REGION: ${{ secrets. AWS_DEFAULT_REGION }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets. AWS_SECRET_ACCESS_KEY }}
+        run: |
+          aws s3 cp --content-disposition "attachment" --cache-control "no-cache" ./${{ env.WHEEL_NAME }} s3://artifact.flower.dev/py/release/v${{ env.TAG_NAME }}/${{ env.WHEEL_NAME }}
+          aws s3 cp --content-disposition "attachment" --cache-control "no-cache" ./${{ env.TAR_NAME }} s3://artifact.flower.dev/py/release/v${{ env.TAG_NAME }}/${{ env.TAR_NAME }}
+          
+      - name: Generate body
+        run: |
+          ./dev/get-latest-changelog.sh > body.md
+          cat body.md
+          
+      - name: Release
+        uses: softprops/action-gh-release@de2c0eb
+        with:
+          body_path: ./body.md
+          draft: true
+          name: Flower ${{ env.TAG_NAME }}
+          files: |
+            ${{ env.WHEEL_NAME }}
+            ${{ env.TAR_NAME }}
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
@@ -11,6 +11,7 @@ jobs:
   release_nightly:
     runs-on: ubuntu-22.04
     name: Nightly
+    if: github.repository == 'adap/flower'
     steps:
       - uses: actions/checkout@v4
       - name: Bootstrap

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -20,7 +20,7 @@ jobs:
     name: Test
     runs-on: macos-latest
     steps:
-      - uses: fwal/setup-swift@cdcbe8e35d3801acd82d7109285e6ab22c9212c2
+      - uses: fwal/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c
         with:
           swift-version: 5
       - uses: actions/checkout@v4
@@ -31,7 +31,7 @@ jobs:
     runs-on: macos-latest
     name: Build docs
     steps:
-      - uses: fwal/setup-swift@cdcbe8e35d3801acd82d7109285e6ab22c9212c2
+      - uses: fwal/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c
         with:
           swift-version: 5
       - uses: actions/checkout@v4
@@ -40,11 +40,11 @@ jobs:
 
   deploy_docs:
     needs: "build_docs"
-    if: github.ref == 'refs/heads/main'
+    if: ${{ github.ref == 'refs/heads/main' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
     runs-on: macos-latest
     name: Deploy docs 
     steps:
-      - uses: fwal/setup-swift@cdcbe8e35d3801acd82d7109285e6ab22c9212c2
+      - uses: fwal/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c
         with:
           swift-version: 5
       - uses: actions/checkout@v4

diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ node_modules
 
 # Flower Examples
 examples/**/dataset/**
-examples/**/dev/*.sh
+#examples/**/dev/*.sh
 
 # Flower Baselines
 baselines/datasets/leaf