refactoring github actions

pbelskiy · Dec 2, 2021 · e0aa0ba · e0aa0ba
1 parent c21d437
commit e0aa0ba
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -1,18 +1,12 @@
+on: ['push', 'pull_request']
 name: Tests
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
-        jenkins-version: ["jenkins:1.554", "jenkins/jenkins:2.60.3", "jenkins/jenkins:lts"]
+        jenkins-version: ['jenkins:1.554', 'jenkins/jenkins:2.60.3', 'jenkins/jenkins:lts']
 
     services:
       jenkins:
@@ -33,6 +27,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install tox coveralls
+
     - name: Get Jenkins initial password
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
@@ -43,19 +38,18 @@ jobs:
         docker exec jenkins jenkins-plugin-cli --plugins cloudbees-folder || true
         docker restart jenkins
         sleep 5
+
     - name: Testing with tox
       env:
         COVERALLS_PARALLEL: true
-        COVERALLS_REPO_TOKEN: ${{ secrets.coveralls }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        tox
-        coveralls --service=github
+      run: tox && coveralls --service=github
 
   finish:
     needs: tests
     runs-on: ubuntu-latest
     steps:
     - name: Coveralls Finished
       run: |
-        curl https://coveralls.io/webhook?repo_token=${{ secrets.coveralls }} -d "payload[build_num]=${{ github.sha }}&payload[status]=done"
+        curl https://coveralls.io/webhook?repo_token=${{ secrets.coveralls }} \
+             -d "payload[build_num]=${{ github.sha }}&payload[status]=done"