Merge branch 'main' into dev
This commit is contained in:
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@@ -54,6 +54,7 @@ jobs:
|
|||||||
docker-compose -f JellyPlex-Watched-CI/jellyfin/docker-compose.yml up -d
|
docker-compose -f JellyPlex-Watched-CI/jellyfin/docker-compose.yml up -d
|
||||||
# Wait for containers to start
|
# Wait for containers to start
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
||||||
docker-compose -f JellyPlex-Watched-CI/plex/docker-compose.yml logs
|
docker-compose -f JellyPlex-Watched-CI/plex/docker-compose.yml logs
|
||||||
docker-compose -f JellyPlex-Watched-CI/jellyfin/docker-compose.yml logs
|
docker-compose -f JellyPlex-Watched-CI/jellyfin/docker-compose.yml logs
|
||||||
|
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ def get_user_library_watched_show(show):
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return show_guids, episode_guids
|
return show_guids, episode_guids
|
||||||
except Exception:
|
except Exception:
|
||||||
return {}, {}
|
return {}, {}
|
||||||
|
|||||||
Reference in New Issue
Block a user