From 6f58db31998460c56c12c348429b1324e49b1e6e Mon Sep 17 00:00:00 2001 From: Chong Shen Ng Date: Mon, 30 Sep 2024 20:54:55 +0100 Subject: [PATCH 1/3] fix(ci:skip) Enable SuperExec CI from fork --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a7c099d8101f..867a20a13466 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -83,7 +83,7 @@ jobs: python-version: ${{ matrix.python-version }} poetry-skip: 'true' - name: Download and install Flower wheel from artifact store - if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} + if: ${{ github.repository == 'adap/flower' && github.actor != 'dependabot[bot]' }} run: | # Define base URL for wheel file WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}" From b1479cd47dbadca7cad4d0b05ede383c81fb9a31 Mon Sep 17 00:00:00 2001 From: Chong Shen Ng Date: Tue, 1 Oct 2024 09:05:10 +0100 Subject: [PATCH 2/3] Allow installation from repo --- .github/workflows/e2e.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 867a20a13466..a2adaae23da0 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -82,8 +82,12 @@ jobs: with: python-version: ${{ matrix.python-version }} poetry-skip: 'true' + - name: Install Flower from repo + if: ${{ github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' }} + run: | + python -m pip install . - name: Download and install Flower wheel from artifact store - if: ${{ github.repository == 'adap/flower' && github.actor != 'dependabot[bot]' }} + if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} run: | # Define base URL for wheel file WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}" From 28d957031b289f62427fa3af13cd00e7a8b79615 Mon Sep 17 00:00:00 2001 From: Chong Shen Ng Date: Tue, 1 Oct 2024 10:00:29 +0100 Subject: [PATCH 3/3] Add pip install for simulation --- .github/workflows/e2e.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a2adaae23da0..355037668f7f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -85,7 +85,11 @@ jobs: - name: Install Flower from repo if: ${{ github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' }} run: | - python -m pip install . + if [[ "${{ matrix.engine }}" == "simulation-engine" ]]; then + python -m pip install ".[simulation]" + else + python -m pip install . + fi - name: Download and install Flower wheel from artifact store if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} run: |