fix properties

Stellarium · Jan 9, 2024 · b36c871 · b36c871
1 parent 509f4bc
commit b36c871
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci-more.yml b/.github/workflows/ci-more.yml
@@ -14,9 +14,7 @@ jobs:
   ci-linux-qt5:
     strategy:
       matrix:
-        include:
-          - arch: aarch64
-          - arch: riscv64
+        arch: [aarch64, riscv64]
     name: "Linux (${{ matrix.arch }}; qt5)"
     runs-on: ubuntu-20.04
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"
@@ -31,7 +29,7 @@ jobs:
 #        tar -zxvf ${{ runner.temp }}/qemu-${{ matrix.arch }}-static.tar.gz
 #        chmod +x ${PWD}/qemu-${{ matrix.arch }}-static
 
-    - name: Configure and build Stellarium
+    - name: Build and run unit tests
       uses: uraimo/run-on-arch-action@v2
       id: build
       with:
@@ -67,14 +65,14 @@ jobs:
           # Installing dependencies
           apt install -y qtbase5-private-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libgps-dev libqt5positioning5 libqt5positioning5-plugins libqt5charts5-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libexiv2-dev libnlopt-cxx-dev
           # Installing dev. env. dependencies
-          apt install -y build-essential gcc g++ cmake gettext fakeroot ccache
+          apt install -y build-essential gcc g++ cmake gettext fakeroot ccache xvfb
           # Installing optional dependencies
           # apt install -y qtwebengine5-dev libqt5webengine5 libqt5webenginecore5 libqt5webenginewidgets5
  
         # Produce a binary artifact and place it in the mounted volume
         run: |
           mkdir -p build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTING=On "${{ github.workspace }}"
+          cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTING=On -DENABLE_SHOWMYSKY=Off -DENABLE_QTWEBENGINE=Off "${{ github.workspace }}"
           make -j3
-          ctest --output-on-failure
+          xvfb-run ctest --output-on-failure
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   # CI on Linux (Qt5)
   ci-linux-qt5:
-    name: "Linux (qt5)"
+    name: "Linux (amd64; qt5)"
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"
 
@@ -49,7 +49,7 @@ jobs:
 
   # CI on Linux (Qt6)
   ci-linux-qt6:
-    name: "Linux (qt6)"
+    name: "Linux (amd64; qt6)"
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"
 
@@ -86,7 +86,7 @@ jobs:
 
   # CI on macOS (Qt5)
   ci-macos-qt5:
-    name: "macOS (qt5)"
+    name: "macOS (x86_64; qt5)"
     runs-on: macos-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"
 
@@ -123,7 +123,7 @@ jobs:
 
   # CI on macOS (Qt6)
   ci-macos-qt6:
-    name: "macOS (qt6)"
+    name: "macOS (x86_64; qt6)"
     runs-on: macos-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"