Work on CI builds

theengs · Jun 15, 2022 · 45f28e1 · 45f28e1
1 parent e65bba4
commit 45f28e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Build dependencies (from contribs script)
         run: |
              cd contribs
-             python3 contribs.py --qt-directory ${{env.Qt6_DIR}}/../../
+             python3 contribs.py --qt-directory ${{env.Qt6_DIR}}/../.. --targets=linux
              cd ..
 
       # Build application
@@ -101,7 +101,7 @@ jobs:
         run: |
              brew install ninja automake autoconf libtool pkg-config
              cd contribs
-             python3 contribs.py --qt-directory ${{env.Qt6_DIR}}/../../
+             python3 contribs.py --qt-directory ${{env.Qt6_DIR}}/../.. --targets=macos
              cd ..
 
       # Build application
@@ -160,7 +160,7 @@ jobs:
       - name: Build dependencies (from contribs script)
         run: |
              cd contribs
-             python3 contribs.py --qt-directory ${{env.Qt6_DIR}}/../../
+             python3 contribs.py --qt-directory ${{env.Qt6_DIR}}/../.. --targets=msvc2019
              cd ..
 
       # Build application

diff --git a/contribs/contribs.py b/contribs/contribs.py
@@ -182,9 +182,9 @@ def copytree_wildcard(src, dst, symlinks=False, ignore=None):
     if "ios_simulator" in targetlist : TARGETS.append(["iOS", "simulator", "iOS"])
     if "ios_armv7" in targetlist : TARGETS.append(["iOS", "armv7", "iOS"])
     if "ios_armv8" in targetlist : TARGETS.append(["iOS", "armv77", "iOS"])
-    if "mscv2017" in targetlist : TARGETS.append(["windows", "x86_64", "msvc2017_64"])
-    if "mscv2019" in targetlist : TARGETS.append(["windows", "x86_64", "msvc2019_64"])
-    if "mscv2022" in targetlist : TARGETS.append(["windows", "x86_64", "msvc2022_64"])
+    if "msvc2017" in targetlist : TARGETS.append(["windows", "x86_64", "msvc2017_64"])
+    if "msvc2019" in targetlist : TARGETS.append(["windows", "x86_64", "msvc2019_64"])
+    if "msvc2022" in targetlist : TARGETS.append(["windows", "x86_64", "msvc2022_64"])
 
 # auto-selection
 if len(TARGETS) == 0: