Merge branch '1.5'

qxmpp-project · Feb 3, 2024 · 57ae858 · 57ae858
2 parents 688a6b9 + d95ec0d
commit 57ae858
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 17 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,29 +7,54 @@ name: tests
 on: [push, pull_request]
 
 jobs:
-  test:
-    runs-on: ${{ matrix.os }}
+  linux:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:stable
     env:
       CONFIG: ${{ matrix.config }}
       QT_VERSION: ${{ matrix.qt_version }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
         config: [minimal, full, full-debug]
         qt_version: ['5.15.*']
         include:
-          - os: ubuntu-latest
-            config: full
+          - config: full
             qt_version: 5.9.*
-          - os: ubuntu-latest
-            config: minimal
-            qt_version: 6.0.*
-          - os: ubuntu-latest
-            config: minimal
-            qt_version: 6.*.*
-          - os: macos-latest
-            config: minimal
+          - config: minimal
+            qt_version: 6.1.*
+          - config: minimal
+            qt_version: 6.6.*
+    steps:
+      - name: Install sudo
+        run: apt update && apt install -qq -y sudo
+      - uses: actions/checkout@v2
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_version }}
+          setup-python: true
+      - name: Install extra packages
+        run: tests/travis/install-build-depends
+      - name: Run tests
+        run: tests/travis/build-and-test
+      - uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  macos:
+    runs-on: macos-latest
+    env:
+      CONFIG: ${{ matrix.config }}
+      QT_VERSION: ${{ matrix.qt_version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: [minimal, full, full-debug]
+        qt_version: ['5.15.*']
+        include:
+          - config: minimal
             qt_version: 6.*.*
     steps:
       - uses: actions/checkout@v2
@@ -41,14 +66,14 @@ jobs:
       - name: Install extra packages
         run: tests/travis/install-build-depends
       - name: Disable OS X firewall
-        if: matrix.os == 'macos-latest'
         run: |
           sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
       - name: Run tests
         run: tests/travis/build-and-test
       - uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+
   windows:
     runs-on: windows-latest
     steps:
@@ -61,12 +86,14 @@ jobs:
           cmake . && cmake --build .
           # ctest
           # ctest --rerun-failed --output-on-failure
+
   xmllint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: sudo apt update && sudo apt install -y libxml2-utils
       - run: xmllint --noout $(find . -type f -name *.xml)
+
   reuse:
     runs-on: ubuntu-latest
     steps:

diff --git a/tests/travis/install-build-depends b/tests/travis/install-build-depends
@@ -31,16 +31,21 @@ if [ "$(uname -s)" = "Darwin" ]; then
 
     case "$CONFIG" in
     full*)
-        brew install doxygen gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly
+        brew install doxygen \
+            gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly
         ;;
     esac
 else
     sudo apt-get update -qq
-    sudo apt-get install -qq clang cmake
+    sudo apt-get install -qq clang cmake git
 
     case "$CONFIG" in
     full*)
-        sudo apt-get install -qq  doxygen graphviz libgstreamer1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly
+        sudo apt-get install -qq \
+            doxygen graphviz \
+            libgstreamer1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly \
+            libprotobuf-c-dev \
+            libssl-dev
         ;;
     esac
 fi