-
Notifications
You must be signed in to change notification settings - Fork 942
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fds-add-divide-resplitter
- Loading branch information
Showing
436 changed files
with
48,422 additions
and
18,679 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| name: Build docker ServerApp image | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| flwr-version: | ||
| description: "Version of Flower." | ||
| required: true | ||
| type: string | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| build-serverapp-images: | ||
| name: Build images | ||
| uses: ./.github/workflows/_docker-build.yml | ||
| # run only on default branch when using it with workflow_dispatch | ||
| if: github.ref_name == github.event.repository.default_branch | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| image: [ | ||
| { | ||
| py-version: "3.8", | ||
| tags: "${{ github.event.inputs.flwr-version }}-py3.8-ubuntu22.04" | ||
| }, | ||
| { | ||
| py-version: "3.9", | ||
| tags: "${{ github.event.inputs.flwr-version }}-py3.9-ubuntu22.04" | ||
| }, | ||
| { | ||
| py-version: "3.10", | ||
| tags: "${{ github.event.inputs.flwr-version }}-py3.10-ubuntu22.04" | ||
| }, | ||
| { | ||
| py-version: "3.11", | ||
| # those are two tags <version>-py3.11-py3.11-ubuntu22.04 and <version> separated by a \n | ||
| tags: "${{ github.event.inputs.flwr-version }}-py3.11-ubuntu22.04\n${{ github.event.inputs.flwr-version }}" | ||
| }, | ||
| ] | ||
| with: | ||
| namespace-repository: flwr/serverapp | ||
| file-dir: src/docker/serverapp | ||
| build-args: | | ||
| FLWR_VERSION=${{ github.event.inputs.flwr-version }} | ||
| PYTHON_VERSION=${{ matrix.image.py-version }} | ||
| UBUNTU_VERSION=ubuntu22.04 | ||
| tags: ${{ matrix.image.tags }} | ||
| secrets: | ||
| dockerhub-user: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }} |
27 changes: 11 additions & 16 deletions
27
.github/workflows/docker-server.yml → .github/workflows/docker-superlink.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,45 @@ | ||
| name: Build docker server image | ||
| name: Build docker SuperLink image | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| flwr-version: | ||
| description: "Version of Flower e.g. (1.7.0)." | ||
| description: "Version of Flower." | ||
| required: true | ||
| type: string | ||
| base-image-tag: | ||
| description: "The tag of the Flower base image." | ||
| required: false | ||
| type: string | ||
| default: "py3.11-ubuntu22.04" | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| build-server-images: | ||
| build-superlink-images: | ||
| name: Build images | ||
| uses: ./.github/workflows/_docker-build.yml | ||
| # run only on default branch when using it with workflow_dispatch | ||
| if: github.ref_name == github.event.repository.default_branch | ||
| with: | ||
| namespace-repository: flwr/server | ||
| file-dir: src/docker/server | ||
| namespace-repository: flwr/superlink | ||
| file-dir: src/docker/superlink | ||
| build-args: | | ||
| FLWR_VERSION=${{ github.event.inputs.flwr-version }} | ||
| BASE_IMAGE_TAG=${{ github.event.inputs.base-image-tag }} | ||
| PYTHON_VERSION=3.11 | ||
| UBUNTU_VERSION=ubuntu22.04 | ||
| tags: | | ||
| ${{ github.event.inputs.flwr-version }}-${{ github.event.inputs.base-image-tag }} | ||
| ${{ github.event.inputs.flwr-version }}-py3.11-ubuntu22.04 | ||
| ${{ github.event.inputs.flwr-version }} | ||
| latest | ||
| secrets: | ||
| dockerhub-user: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }} | ||
|
|
||
| summary: | ||
| name: Build images | ||
| name: Summary | ||
| runs-on: ubuntu-22.04 | ||
| needs: build-server-images | ||
| needs: build-superlink-images | ||
| timeout-minutes: 10 | ||
| steps: | ||
| - run: | | ||
| echo "### Images" >> $GITHUB_STEP_SUMMARY | ||
| echo "" >> $GITHUB_STEP_SUMMARY | ||
| for IMAGE in $(echo ${{ toJson(needs.build-server-images.outputs.metadata) }} | jq -r '.tags[]' ); do | ||
| for IMAGE in $(echo ${{ toJson(needs.build-superlink-images.outputs.metadata) }} | jq -r '.tags[]' ); do | ||
| echo "- $IMAGE" >> $GITHUB_STEP_SUMMARY | ||
| done |
Oops, something went wrong.