Merge pull request #177 from ptr727/main

Main to Develop
ptr727 · Jun 21, 2023 · bcf6740 · bcf6740
2 parents f5b4080 + aae790c
commit bcf6740
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/BuildDockerPush.yml b/.github/workflows/BuildDockerPush.yml
@@ -147,7 +147,7 @@ jobs:
       # Login to Docker Hub
       # https://github.com/marketplace/actions/docker-login
       - name: Login to Docker Hub
-        if: ${{ env.dopush }}
+        if: env.dopush == 'true'
         uses: docker/login-action@v2
         with:
           registry: docker.io
@@ -164,8 +164,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          cache-from: type=gha,scope=${{ matrix.cache-scope }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.cache-scope }}
+          # GitHub cache as unreliable as posting to GHCR, broken pipe errors
+          # cache-from: type=gha,scope=${{ matrix.cache-scope }}
+          # cache-to: type=gha,mode=max,scope=${{ matrix.cache-scope }}
           file: ${{ matrix.file }}
           push: ${{ (github.event_name != 'pull_request') }}
           # TODO: How to test for secret not null and avoid "null= is not a valid secret"

diff --git a/.github/workflows/BuildGitHubRelease.yml b/.github/workflows/BuildGitHubRelease.yml
@@ -125,7 +125,7 @@ jobs:
 
       # https://github.com/marketplace/actions/upload-a-build-artifact
       - name: Upload build artifacts
-        if: ${{ env.dopush }}
+        if: env.dopush == 'true'
         uses: actions/upload-artifact@v3
         with:
           name: publish

diff --git a/Docker/README.md b/Docker/README.md
@@ -53,7 +53,7 @@ Images are updated weekly with the latest upstream updates.
 ### `ptr727/plexcleaner:latest`
 
 ```text
-PlexCleaner: 3.1.55+ecc33e58d2 16:47:01 [INF] <1> Exit Code : 0
+PlexCleaner: 3.1.62+81ebbddd77 06:59:25 [INF] <1> Exit Code : 0
 dotNET: 7.0.304
 HandBrakeCLI: HandBrake 20230223192356-5c2b5d2d0-1.6.x
 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04
@@ -65,7 +65,7 @@ FfMpeg: ffmpeg version 6.0-0ubuntu1~22.04.sav1.1 Copyright (c) 2000-2023 the FFm
 ### `ptr727/plexcleaner:savoury`
 
 ```text
-PlexCleaner: 3.1.55+ecc33e58d2 16:47:01 [INF] <1> Exit Code : 0
+PlexCleaner: 3.1.62+81ebbddd77 06:59:25 [INF] <1> Exit Code : 0
 dotNET: 7.0.304
 HandBrakeCLI: HandBrake 20230223192356-5c2b5d2d0-1.6.x
 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04
@@ -77,7 +77,7 @@ FfMpeg: ffmpeg version 6.0-0ubuntu1~22.04.sav1.1 Copyright (c) 2000-2023 the FFm
 ### `ptr727/plexcleaner:debian`
 
 ```text
-PlexCleaner: 3.1.55+ecc33e58d2 16:23:00 [INF] <1> Exit Code : 0
+PlexCleaner: 3.1.62+81ebbddd77 06:59:17 [INF] <1> Exit Code : 0
 dotNET: 7.0.304
 HandBrakeCLI: HandBrake 1.6.1
 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04
@@ -89,7 +89,7 @@ FfMpeg: ffmpeg version 5.1.3-1 Copyright (c) 2000-2022 the FFmpeg developers bui
 ### `ptr727/plexcleaner:alpine`
 
 ```text
-PlexCleaner: 3.1.55+ecc33e58d2 16:22:31 [INF] <1> Exit Code : 0
+PlexCleaner: 3.1.62+81ebbddd77 06:58:58 [INF] <1> Exit Code : 0
 dotNET: 7.0.304
 HandBrakeCLI: HandBrake 1.6.1
 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04
@@ -101,7 +101,7 @@ FfMpeg: ffmpeg version 6.0 Copyright (c) 2000-2023 the FFmpeg developers built w
 ### `ptr727/plexcleaner:arch`
 
 ```text
-PlexCleaner: 3.1.55+ecc33e58d2 16:22:55 [INF] <1> Exit Code : 0
+PlexCleaner: 3.1.62+81ebbddd77 06:59:17 [INF] <1> Exit Code : 0
 dotNET: 7.0.105
 HandBrakeCLI: HandBrake 1.6.1
 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04

diff --git a/PlexCleaner/PlexCleaner.csproj b/PlexCleaner/PlexCleaner.csproj
@@ -39,11 +39,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="InsaneGenius.Utilities" Version="3.0.18" />
+    <PackageReference Include="InsaneGenius.Utilities" Version="3.0.23" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog" Version="3.0.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />