diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml index 7d92a16d..5d4d8758 100644 --- a/.github/workflows/pipeline.yaml +++ b/.github/workflows/pipeline.yaml @@ -11,6 +11,7 @@ env: jobs: detect-deployment-environment: + if: github.actor != 'github-merge-queue' runs-on: ubuntu-latest outputs: environment: ${{ steps.set-env.outputs.environment }} @@ -26,6 +27,7 @@ jobs: echo "environment=none" >> $GITHUB_OUTPUT fi static_analysis: + if: github.actor != 'github-merge-queue' strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] @@ -55,6 +57,7 @@ jobs: run: semgrep scan --config auto --error test-without-llms: + if: github.actor != 'github-merge-queue' strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] @@ -67,6 +70,7 @@ jobs: secrets: inherit # pragma: allowlist secret test-with-anthropic: + if: github.actor != 'github-merge-queue' uses: ./.github/workflows/test.yaml with: python-version: "3.9" @@ -77,6 +81,7 @@ jobs: - test-without-llms test-with-azure_oai: + if: github.actor != 'github-merge-queue' uses: ./.github/workflows/test.yaml with: python-version: "3.9" @@ -87,6 +92,7 @@ jobs: - test-without-llms test-with-openai: + if: github.actor != 'github-merge-queue' uses: ./.github/workflows/test.yaml with: python-version: "3.9" @@ -97,6 +103,7 @@ jobs: - test-without-llms test-with-togetherai: + if: github.actor != 'github-merge-queue' uses: ./.github/workflows/test.yaml with: python-version: "3.9" @@ -107,6 +114,7 @@ jobs: - test-without-llms test-with-llm: + if: github.actor != 'github-merge-queue' uses: ./.github/workflows/test.yaml with: python-version: "3.9" @@ -121,7 +129,7 @@ jobs: - test-with-togetherai test-macos-latest: - if: github.event.pull_request.draft == false + if: github.actor != 'github-merge-queue' && github.event.pull_request.draft == false runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -141,7 +149,7 @@ jobs: run: bash scripts/test.sh -m "not (db or nats or anthropic or azure_oai or openai or togetherai or llm)" test-windows-latest: - if: github.event.pull_request.draft == false + if: github.actor != 'github-merge-queue' && github.event.pull_request.draft == false runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -161,7 +169,7 @@ jobs: run: bash scripts/test.sh -m "not (db or nats or anthropic or azure_oai or openai or togetherai or llm)" coverage-combine: - if: github.event.pull_request.draft == false + if: github.actor != 'github-merge-queue' && github.event.pull_request.draft == false needs: - test-without-llms - test-with-llm @@ -201,6 +209,7 @@ jobs: path: htmlcov unit_test_wasp: + if: github.actor != 'github-merge-queue' runs-on: ubuntu-22.04 permissions: contents: read @@ -303,6 +312,7 @@ jobs: run: docker push ghcr.io/$GITHUB_REPOSITORY --all-tags pre-commit-check: + if: github.actor != 'github-merge-queue' runs-on: ubuntu-latest env: SKIP: "static-analysis" @@ -323,7 +333,7 @@ jobs: # https://github.com/marketplace/actions/alls-green#why check: # This job does nothing and is only used for the branch protection - if: github.event.pull_request.draft == false + if: github.actor != 'github-merge-queue' && github.event.pull_request.draft == false needs: - static_analysis diff --git a/pyproject.toml b/pyproject.toml index 1c70727f..c44d45dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,18 +44,18 @@ classifiers = [ dynamic = ["version"] dependencies = [ - "pyautogen[anthropic,together]==0.2.31", + "pyautogen[anthropic,together]==0.2.32", "faststream[nats]>=0.5.10,<0.6", "typing-extensions>=4.8.0,<5", "pydantic>=2.3,<3", "fastapi==0.110.2", "prisma>=0.13.1,<0.14", - "fastapi-code-generator==0.5.0", + "fastapi-code-generator==0.5.1", "asyncer==0.0.7", "markdownify==0.12.1", # Needed by autogen.WebSurferAgent but not included "httpx==0.27.0", "python-weather==2.0.3", # should be removed when we move API to another project - "together>=1.2.0,<2", + "together>=1.2.1,<2", ] [project.optional-dependencies]