Merge pull request avocado-framework#5958 from richtja/coverage_in_ma…

…ster Coverage CI after push to master
richtja · Jun 18, 2024 · d752cb2 · d752cb2
2 parents cd83d9a + 674e233
commit d752cb2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,39 +105,6 @@ jobs:
           retention-days: 1
       - run: echo "🥑 This job's status is ${{ job.status }}."
 
-  code-coverage:
-
-    name: Code Coverage
-    runs-on: ubuntu-20.04
-
-    strategy:
-      matrix:
-        python-version: [3.11]
-    env:
-      CC_TEST_REPORTER_ID: "387887b88a76f31c2c376219fc749689ea5975c8fe7fcd9609f1dcc139e053a6"
-
-    steps:
-      - run: echo "Job triggered by a ${{ github.event_name }} event on branch is ${{ github.ref }} in repository is ${{ github.repository }}, runner on ${{ runner.os }}"
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install
-        run: |
-         pip install -r requirements-dev.txt
-         curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-         chmod +x ./cc-test-reporter
-      - name: Run pre script
-        run: ./cc-test-reporter before-build
-      - name: Run script
-        run: |
-         python setup.py develop --user
-         ./selftests/run_coverage
-      - name: Run post script
-        run: ./cc-test-reporter after-build --debug
-      - run: echo "🥑 This job's status is ${{ job.status }}."
 
 
 # macOS check on latest Python

diff --git a/.github/workflows/codeql.yml → .github/workflows/push_ci.yml b/.github/workflows/codeql.yml → .github/workflows/push_ci.yml
@@ -1,4 +1,4 @@
-name: "CodeQL"
+name: "PR and Push checks"
 
 on:
   push:
@@ -69,3 +69,37 @@ jobs:
       uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
+
+  code-coverage:
+
+    name: Code Coverage
+    runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        python-version: [3.11]
+    env:
+      CC_TEST_REPORTER_ID: "387887b88a76f31c2c376219fc749689ea5975c8fe7fcd9609f1dcc139e053a6"
+
+    steps:
+      - run: echo "Job triggered by a ${{ github.event_name }} event on branch is ${{ github.ref }} in repository is ${{ github.repository }}, runner on ${{ runner.os }}"
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install
+        run: |
+         pip install -r requirements-dev.txt
+         curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+         chmod +x ./cc-test-reporter
+      - name: Run pre script
+        run: ./cc-test-reporter before-build
+      - name: Run script
+        run: |
+         python setup.py develop --user
+         ./selftests/run_coverage
+      - name: Run post script
+        run: ./cc-test-reporter after-build --debug
+      - run: echo "🥑 This job's status is ${{ job.status }}."