Merge pull request #34 from Ostorlab/trigger-actions-on-all-branches

Trigger github actions without duplicate.
Ostorlab · May 22, 2023 · 507e20a · 507e20a
2 parents 6edb06d + cbd3fc7
commit 507e20a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 35 deletions.
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -1,3 +1,4 @@
+---
 # This workflow use pylint:
 #  - Install Python dependencies.
 #  - Run pylint for each of the supported Python versions.
@@ -7,9 +8,11 @@ name: Pylint & Mypy
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
   pull_request:
-    branches: [ main ]
+    branches:
+      - '*'
 
 jobs:
   build:
@@ -21,21 +24,21 @@ jobs:
         python-version: ["3.10"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies.
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install -r requirement.txt
-        python -m pip install -r tests/test-requirement.txt
-    - name: Running Black.
-      uses: psf/black@stable
-      with:
-        options: "--check"
-    - name: Running linter.
-      run: |
-        pylint --rcfile=.pylintrc --ignore=tests/ agent/
-        pylint --rcfile=.pylintrc -d C0103,W0613 tests/
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies.
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirement.txt
+          python -m pip install -r tests/test-requirement.txt
+      - name: Running Black.
+        uses: psf/black@stable
+        with:
+          options: "--check"
+      - name: Running linter.
+        run: |
+          pylint --rcfile=.pylintrc --ignore=tests/ agent/
+          pylint --rcfile=.pylintrc -d C0103,W0613 tests/
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -1,3 +1,4 @@
+---
 # This workflow use pytest:
 #  - Install Python dependencies.
 #  - Run pytest for each of the supported Python versions ["3.8", "3.9", "3.10"]. 
@@ -7,9 +8,11 @@ name: Pytest.
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
   pull_request:
-    branches: [ main ]
+    branches:
+      - '*'
 
 concurrency:
   group: ${{ github.ref }}
@@ -24,16 +27,16 @@ jobs:
         python-version: ["3.10"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies.
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install -r requirement.txt
-        python -m pip install -r tests/test-requirement.txt
-    - name: Runnning tests with pytest.
-      run: |
-        pytest -m "not docker" --cov
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies.
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirement.txt
+          python -m pip install -r tests/test-requirement.txt
+      - name: Runnning tests with pytest.
+        run: |
+          pytest -m "not docker" --cov