From 047f76790a87e7cf2fdbf084c185627e79daca1f Mon Sep 17 00:00:00 2001
From: NickLucche <nlucches@redhat.com>
Date: Mon, 16 Sep 2024 18:00:52 +0200
Subject: [PATCH] only dependabot skips codecov upload

---
 .github/workflows/pr_tests.yaml | 85 ---------------------------------
 .github/workflows/tests.yaml    |  3 ++
 2 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 .github/workflows/pr_tests.yaml

diff --git a/.github/workflows/pr_tests.yaml b/.github/workflows/pr_tests.yaml
deleted file mode 100644
index 8627a20..0000000
--- a/.github/workflows/pr_tests.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Tests
-
-on:
-  # this target allows you to run tests in base context and access secrets
-  # so we can have dependabot PRs auto-merge on test pass
-  pull_request_target:
-    branches:
-      - main
-  merge_group:
-  workflow_dispatch:
-
-env:
-  FORCE_COLOR: "1"
-  # facilitate testing by building vLLM for CPU when needed
-  VLLM_CPU_DISABLE_AVX512: "true"
-  VLLM_TARGET_DEVICE: "cpu"
-  # prefer torch cpu version
-  PIP_EXTRA_INDEX_URL: "https://download.pytorch.org/whl/cpu"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  tests:
-    timeout-minutes: 20
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        pyv: ["3.11"]
-        vllm_version:
-          # - "" # skip the pypi version as it will not work on CPU
-          - "git+https://github.com/vllm-project/vllm@v0.6.1"
-          - "git+https://github.com/vllm-project/vllm@main"
-          - "git+https://github.com/opendatahub-io/vllm@main"
-
-    steps:
-      - name: Check out the PR
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@v1.3.1
-        with:
-          tool-cache: false
-          large-packages: false
-          docker-images: false
-      - name: Install vLLM build deps
-        run: |
-          sudo apt update
-          sudo apt install --no-install-recommends -y \
-            libnuma-dev libdnnl-dev opencl-dev
-
-      - name: Set up Python ${{ matrix.pyv }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.pyv }}
-
-      - name: Upgrade pip and nox
-        run: |
-          python -m pip install --upgrade pip nox
-          pip --version
-          nox --version
-
-      - name: Lint code and check dependencies
-        run: nox -v -s lint-${{ matrix.pyv }}
-
-      - name: Run tests
-        run: nox -v -s tests-${{ matrix.pyv }} -- --cov-report=xml
-        env:
-          VLLM_VERSION_OVERRIDE: ${{ matrix.vllm_version }}
-
-      - name: Upload coverage report (Dependabot only)
-        if: github.actor == 'dependabot[bot]'
-        uses: codecov/codecov-action@v4
-        with:
-          fail_ci_if_error: true
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Build package
-        run: nox -s build-${{ matrix.pyv }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d66514b..afe887e 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -3,6 +3,8 @@ name: Tests
 on:
   push:
     branches: [main]
+  pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
     - cron: "20 4 * * 2" # once a week
@@ -73,6 +75,7 @@ jobs:
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v4
+        if: github.actor != 'dependabot[bot]'
         with:
           fail_ci_if_error: true
         env: