Merge pull request #60 from cloudblue/rationalize-build-process

Improve workflow build process

Author: marcserrat

.github/workflows/build.yml

@@ -17,7 +17,8 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8]
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
@@ -37,20 +38,15 @@ jobs:
     - name: Testing
       run: |
         python setup.py test
-    - name: Integration tests
-      run: |
-        ./travis_integration_tests.sh
-    - name: Compatibility tests
-      run: |
-        ./travis_compat_tests.sh
   build_3_8_9_django_3_2:
     name: Build on Python 3.8, 3.9 django 3.2
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.8, 3.9]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
@@ -70,20 +66,15 @@ jobs:
       - name: Testing
         run: |
           python setup.py test
-      - name: Integration tests
-        run: |
-          ./travis_integration_tests.sh
-      - name: Compatibility tests
-        run: |
-          ./travis_compat_tests.sh
   build_3_10_django_4_0:
     name: Build on Python 3.10 django 4.0
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.10.1]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
@@ -103,20 +94,29 @@ jobs:
       - name: Testing
         run: |
           python setup.py test
-      - name: Integration tests
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          INTEGRATION_TESTS: yes
+  sonar:
+    name: Sonar Checks
+    needs: [build_3_6_7_8_django_2_2, build_3_8_9_django_3_2, build_3_10_django_4_0]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Python '3.10.0'
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.10.0'
+      - name: Install dependencies
         run: |
-          ./travis_integration_tests.sh
-      - name: Compatibility tests
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          COMPAT_TESTS: yes
+          python -m pip install --upgrade pip
+          pip install -r requirements/dev.txt
+          pip install -r requirements/test.txt
+          pip install pytest-cov
+          pip install django==4.0.*
+      - name: Testing
         run: |
-          ./travis_compat_tests.sh
+          python setup.py test
       - name: Fix coverage report for Sonar
         run: |
           sed -i 's/\/home\/runner\/work\/django-cqrs\/django-cqrs\//\/github\/workspace\//g' coverage.xml
@@ -128,9 +128,36 @@ jobs:
       - name: Wait sonar to process report
         uses: jakejarvis/wait-action@master
         with:
-          time: '120s'
+          time: '15s'
       - name: SonarQube Quality Gate check
         uses: sonarsource/sonarqube-quality-gate-action@master
         timeout-minutes: 5
         env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  compatibility:
+    name: Compatibility and Integration Tests
+    needs: [sonar]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Python '3.10.0'
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.10.0'
+      - name: Integration tests
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          INTEGRATION_TESTS: yes
+        run: |
+          ./travis_integration_tests.sh
+      - name: Compatibility tests
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          COMPAT_TESTS: yes
+        run: |
+          ./travis_compat_tests.sh

.github/workflows/publish.yml

@@ -8,17 +8,15 @@ jobs:
   publish:
     name: Build and Publish
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ 3.8 ]
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -43,7 +41,7 @@ jobs:
     - name: Wait sonar to process report
       uses: jakejarvis/wait-action@master
       with:
-        time: '60s'
+        time: '15s'
     - name: SonarQube Quality Gate check
       uses: sonarsource/sonarqube-quality-gate-action@master
       timeout-minutes: 5