diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index d1de7bed531e..f0a2c520f159 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -1,8 +1,9 @@ name: Release nightly on: - schedule: - - cron: "0 23 * * *" + push: + # schedule: + # - cron: "0 23 * * *" env: FLWR_TELEMETRY_ENABLED: 0 @@ -24,19 +25,21 @@ jobs: uses: ./.github/actions/bootstrap - name: Release nightly id: release - env: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} + # env: + # PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} run: | - RESULT=$(./dev/publish-nightly.sh) - if [ "$RESULT" == "There were no commits in the last 24 hours." ]; then - echo "skip=true" >> $GITHUB_OUTPUT - fi + # RESULT=$(./dev/publish-nightly.sh) + # if [ "$RESULT" == "There were no commits in the last 24 hours." ]; then + # echo "skip=true" >> $GITHUB_OUTPUT + # fi echo "pip-version=${{ steps.bootstrap.outputs.pip-version }}" >> "$GITHUB_OUTPUT" echo "setuptools-version=${{ steps.bootstrap.outputs.setuptools-version }}" >> "$GITHUB_OUTPUT" - NAME=$(poetry version | awk {'print $1'}) - VERSION=$(poetry version -s) + # NAME=$(poetry version | awk {'print $1'}) + # VERSION=$(poetry version -s) + NAME=flwr-nightly + VERSION=1.13.0.dev20241111 python dev/build-docker-image-matrix.py --flwr-version "${VERSION}" --matrix nightly --flwr-package "${NAME}" > matrix.json echo "matrix=$(cat matrix.json)" >> $GITHUB_OUTPUT @@ -49,7 +52,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.release-nightly.outputs.matrix).base }} with: - namespace-repository: ${{ matrix.images.namespace_repository }} + namespace-repository: flwr/github-ci-test-builds file-dir: ${{ matrix.images.file_dir }} build-args: | PIP_VERSION=${{ needs.release-nightly.outputs.pip-version }} @@ -69,7 +72,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.release-nightly.outputs.matrix).binary }} with: - namespace-repository: ${{ matrix.images.namespace_repository }} + namespace-repository: flwr/github-ci-test-builds file-dir: ${{ matrix.images.file_dir }} build-args: BASE_IMAGE=${{ matrix.images.base_image }} tags: ${{ matrix.images.tags_encoded }} diff --git a/dev/build-docker-image-matrix.py b/dev/build-docker-image-matrix.py index 1d75603f5755..00eefed35130 100644 --- a/dev/build-docker-image-matrix.py +++ b/dev/build-docker-image-matrix.py @@ -453,17 +453,25 @@ class NightlyBaseImageBuildArgs: generate_binary_images( "superlink", base_images, - lambda image: image.tags, + lambda image: [f"superlink{image.tags[0]}", f"superlink{image.tags[1]}"], lambda image: isinstance(image.build_args.variant.extras, CpuVariant), ) + generate_binary_images( "supernode", base_images, - lambda image: image.tags, + lambda image: [f"supernode{image.tags[0]}", f"supernode{image.tags[1]}"], lambda image: isinstance(image.build_args.variant.extras, CpuVariant), ) - + generate_binary_images("serverapp", base_images, lambda image: image.tags) - + generate_binary_images("clientapp", base_images, lambda image: image.tags) + + generate_binary_images( + "serverapp", + base_images, + lambda image: [f"serverapp{image.tags[0]}", f"serverapp{image.tags[1]}"], + ) + + generate_binary_images( + "clientapp", + base_images, + lambda image: [f"clientapp{image.tags[0]}", f"clientapp{image.tags[1]}"], + ) ) return base_images, binary_images