Merge branch 'master' into next

AlbrechtL · Oct 9, 2024 · c7c6ae8 · c7c6ae8
2 parents 86a6fda + a910d9d
commit c7c6ae8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -32,8 +32,6 @@ on:
       - master
       - next
       - 'next*'
-    tags:
-      - 'v*'
 
 jobs:
   android:

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -6,8 +6,6 @@ on:
       - master
       - next
       - 'next*'
-    tags:
-      - 'v*'
 
 jobs:
   qtbuild:
@@ -18,7 +16,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.7.2'
+          version: '6.8.0'
           modules: 'qtcharts qtmultimedia qt5compat qtshadertools'
       - name: Checkout
         uses: actions/checkout@v4
@@ -67,7 +65,7 @@ jobs:
         id: create_appimage
         run: |
           # Get appimagetool
-          # wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
+          #wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
           wget https://welle-io-nightlies.albrechtloh.de/appimagetool-843-x86_64.AppImage # just for testing
           chmod +x appimagetool-*.AppImage
 

diff --git a/.github/workflows/raspberrypi.yml b/.github/workflows/raspberrypi.yml
@@ -6,8 +6,6 @@ on:
       - master
       - next
       - 'next*'
-    tags:
-      - 'v*'
 
 jobs:
   buildx:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,8 +6,6 @@ on:
       - master
       - next
       - 'next*'
-    tags:
-      - 'v*'
 
 jobs:
   qtbuild:
@@ -18,10 +16,10 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.7.2'
+          version: '6.8.0'
           modules: 'qtcharts qtmultimedia qt5compat qtshadertools'
           arch: 'win64_mingw'
-          tools: 'tools_mingw90'
+          tools: 'tools_mingw1310'
       - name: Checkout
         uses: actions/checkout@v4
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,8 +32,6 @@ on: @@
           - master
           - next
           - 'next*'
-        tags:
-          - 'v*'
     jobs:
       android:
@@ Expand Down @@