CI: Move static presets to nightly

KDAB · Nov 6, 2023 · 5980728 · 5980728
1 parent 847287b
commit 5980728
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,10 +34,6 @@ jobs:
             qt_version: "5.15"
           - name: ci-qtquick-qt5
             qt_version: "5.15"
-          - name: ci-release-static-qt5
-            qt_version: "5.15"
-          - name: ci-dev-static-qt5
-            qt_version: "5.15"
           - name: ci-dev-qt6
             qt_version: "6.3.*"
           - name: ci-release-qt6
@@ -46,10 +42,7 @@ jobs:
             qt_version: "6.3.*"
           - name: ci-qtquick-qt6
             qt_version: "6.3.*"
-          - name: ci-release-static-qt6
-            qt_version: "6.3.*"
-          - name: ci-dev-static-qt6
-            qt_version: "6.3.*"
+
         include:
           - os: ubuntu-22.04
             preset:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,6 +7,13 @@ name: Nightly CI
 on:
   schedule:
   - cron: '0 3 * * *'
+  # TODO remove if green
+  push:
+    branches:
+      - 2.0
+  pull_request:
+    branches:
+      - 2.0
 
 jobs:
   build:
@@ -20,10 +27,18 @@ jobs:
           - macos-13
 
         preset:
+          - name: ci-release-static-qt5
+            qt_version: "5.15"
+          - name: ci-dev-static-qt5
+            qt_version: "5.15"
           - name: ci-python-qt6
             qt_version: "6.6.0"
             apt_pgks:
               - llvm
+          - name: ci-release-static-qt6
+            qt_version: "6.3.*"
+          - name: ci-dev-static-qt6
+            qt_version: "6.3.*"
 
         include:
           - os: ubuntu-22.04