Inverted build order

androidWG · Dec 16, 2023 · 47794fb · 47794fb
1 parent b85c258
commit 47794fb
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -10,37 +10,42 @@ permissions:
   contents: read
 
 jobs:
-  test:
+  build:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
 
     runs-on: ${{ matrix.os }}
 
-    # TODO: Add cache support
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - name: Setup environment
+        shell: bash
         run: |
+          if [ "$RUNNER_OS" == "Linux" ]; then
+              sudo apt-get install libcairo-dev libgirepository1.0-dev
+          fi
           python -m pip install packaging pipenv psutil
           python setup.py setup
-#      - name: Get pip cache dir
-#        id: pipenv-cache
-#        run: |
-#          echo "dir=$(pipenv --venv)" >> $GITHUB_OUTPUT
-      - name: Run tests
-        run: python setup.py test
-  build:
+      - name: Build
+        run: python setup.py build
+      - name: Upload files
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }} dist files
+          path: dist/discord.fm-*
+  test:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
 
     runs-on: ${{ matrix.os }}
 
+    # TODO: Add cache support
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.11
@@ -51,18 +56,9 @@ jobs:
         shell: bash
         run: |
           if [ "$RUNNER_OS" == "Linux" ]; then
-              sudo apt install libgirepository1.0-dev
+              sudo apt-get install libcairo-dev libgirepository1.0-dev
           fi
           python -m pip install packaging pipenv psutil
           python setup.py setup
-#      - name: Get pip cache dir
-#        id: pipenv-cache
-#        run: |
-#          echo "dir=$(pipenv --venv)" >> $GITHUB_OUTPUT
-      - name: Build
-        run: python setup.py build
-      - name: Upload files
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.os }} dist files
-          path: dist/discord.fm-*
+      - name: Run tests
+        run: python setup.py test