Update workflows

Signed-off-by: Georgia Stuart <[email protected]>
SCIInstitute · Dec 18, 2024 · 7d955be · 7d955be
1 parent b7ca088
commit 7d955be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -30,10 +30,6 @@ jobs:
     - name: Print out Qt directory
       run: echo $Qt5_DIR; echo $Qt5_Dir
 
-    - name: Prepare
-      run: |
-        ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
-
     - name: make
       run: ./build.sh -DQt_PATH="${Qt5_Dir}"
 
@@ -85,10 +81,6 @@ jobs:
         setup-python: 'true'
         install-deps: true
 
-    - name: Prepare
-      run: |
-        ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
-
     - name: make
       run: ./build.sh -DBUILD_WITH_PYTHON=OFF -DQt_PATH="${Qt5_Dir}"
 
@@ -131,10 +123,6 @@ jobs:
     - name: Print out Qt directory
       run: echo $Qt5_DIR; echo $Qt5_Dir
 
-    - name: Prepare
-      run: |
-        ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
-
     - name: make
       run: ./build.sh -DWITH_OSPRAY:BOOL=ON -DQt_PATH="${Qt5_Dir}"
 
@@ -173,10 +161,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Prepare
-      run: |
-        ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
-
     - name: Compile
       run: ./build.sh -DBUILD_HEADLESS:BOOL=ON -DBUILD_TESTING:BOOL=ON
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -53,7 +53,7 @@ jobs:
         target: desktop
         host: windows
         arch: win64_msvc2019_64
-        setup-python: 'false'
+        setup-python: 'true'
         install-deps: true
 
     - name: Print out Qt directory
@@ -101,7 +101,7 @@ jobs:
         target: desktop
         host: windows
         arch: win64_msvc2019_64
-        setup-python: 'false'
+        setup-python: 'true'
         install-deps: true
 
     - name: Print out Qt directory
@@ -110,7 +110,7 @@ jobs:
     - name: Configure
       working-directory: bin
       run: |
-        cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DSCIRUN_QT_MIN_VERSION:STRING="6.3.1" -DQt_PATH:PATH="$env:Qt6_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
+        cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DSCIRUN_QT_MIN_VERSION:STRING="6.3.1" -DQt_PATH:PATH="$env:QT_ROOT_DIR" -DBUILD_WITH_PYTHON:BOOL=OFF
 
     - name: Compile
       working-directory: bin
@@ -149,7 +149,7 @@ jobs:
         target: desktop
         host: windows
         arch: win64_msvc2019_64
-        setup-python: 'false'
+        setup-python: 'true'
         install-deps: true
 
     - name: Configure
@@ -205,7 +205,7 @@ jobs:
         target: desktop
         host: windows
         arch: win64_msvc2019_64
-        setup-python: 'false'
+        setup-python: 'true'
         install-deps: true
 
     - name: Configure