Run system tests on GH actions for windows

theotherp · Nov 20, 2023 · f4fd23b · f4fd23b
1 parent 522b4c1
commit f4fd23b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
@@ -194,7 +194,10 @@ jobs:
 
             - name: "Start NZBHydra"
               run: |
-                  Start-Process .\NZBHydra2.exe
+                # Produces "The specified executable is not a valid application for this OS platform." on GH runner.
+                #                  Start-Process .\NZBHydra2.exe
+                       $Env:SPRING_PROFILES_ACTIVE= "build,systemtest,core"
+                       Start-Process .\core.exe directstart
 
             - name: Set up JDK 17
               uses: actions/setup-java@v3

diff --git a/docker/docker-compose-systemtest/windows/docker-compose.yaml b/docker/docker-compose-systemtest/windows/docker-compose.yaml
@@ -1,7 +1,4 @@
 version: '3'
-networks:
-    systemtest:
-        external: true
 services:
     mockserver:
         image: ghcr.io/theotherp/mockserver:3.1.0
@@ -10,7 +7,7 @@ services:
             - "5080:5080"
         environment:
             - spring_profiles_active=build,systemtest
-        networks: [ "host" ]
+        network_mode: "host"
         restart: unless-stopped
     sonarr:
         image: lscr.io/linuxserver/sonarr:latest
@@ -23,7 +20,7 @@ services:
             - ../../sonarr/data:/config
         ports:
             - "8989:8989"
-        networks: [ "host" ]
+        network_mode: "host"
         restart: unless-stopped
     radarr:
         image: lscr.io/linuxserver/radarr:latest
@@ -36,5 +33,5 @@ services:
             - ../../radarr/data:/config
         ports:
             - "7878:7878"
-        networks: [ "host" ]
+        network_mode: "host"
         restart: unless-stopped
diff --git a/other/wrapper/pyInstaller/windows/systemTray.py b/other/wrapper/pyInstaller/windows/systemTray.py
@@ -32,7 +32,7 @@ def shutdown():
         if result.status_code != 200:
             nzbhydra2wrapperPy3.process.terminate()
         stop()
-    elif nzbhydra2wrapperPy3.process is not None:
+    elif hasattr(nzbhydra2wrapperPy3, "process") and nzbhydra2wrapperPy3.process is not None:
         nzbhydra2wrapperPy3.process.terminate()
         stop()
     else: