From 19fc42c30bd2bee65185fef865030600a5f2c716 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 18 Jun 2023 18:41:53 +0000 Subject: [PATCH 1/3] Bump InsaneGenius.Utilities from 3.0.14 to 3.0.15 Bumps [InsaneGenius.Utilities](https://github.com/ptr727/Utilities) from 3.0.14 to 3.0.15. - [Release notes](https://github.com/ptr727/Utilities/releases) - [Commits](https://github.com/ptr727/Utilities/compare/3.0.14...3.0.15) --- updated-dependencies: - dependency-name: InsaneGenius.Utilities dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- PlexCleaner/PlexCleaner.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlexCleaner/PlexCleaner.csproj b/PlexCleaner/PlexCleaner.csproj index 007bb945..36d0a893 100644 --- a/PlexCleaner/PlexCleaner.csproj +++ b/PlexCleaner/PlexCleaner.csproj @@ -39,7 +39,7 @@ - + From 37d579a9f7f7114450f860ad77b9138bb5d00126 Mon Sep 17 00:00:00 2001 From: ptr727 Date: Sun, 18 Jun 2023 19:02:02 +0000 Subject: [PATCH 2/3] Update generated README.md --- Docker/README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Docker/README.md b/Docker/README.md index 0e1a6fa5..54034c86 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -53,8 +53,8 @@ Images are updated weekly with the latest upstream updates. ### `ptr727/plexcleaner:latest` ```text -PlexCleaner: 3.1.35+4908684b8f 14:28:12 [INF] <1> Exit Code : 0 -dotNET: 7.0.302 +PlexCleaner: 3.1.37+a319855c20 19:01:43 [INF] <1> Exit Code : 0 +dotNET: 7.0.304 HandBrakeCLI: HandBrake 20230223192356-5c2b5d2d0-1.6.x MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04 MkvMerge: mkvmerge v77.0 ('Elemental') 64-bit @@ -65,8 +65,8 @@ FfMpeg: ffmpeg version 6.0-0ubuntu1~22.04.sav1.1 Copyright (c) 2000-2023 the FFm ### `ptr727/plexcleaner:savoury` ```text -PlexCleaner: 3.1.35+4908684b8f 14:28:12 [INF] <1> Exit Code : 0 -dotNET: 7.0.302 +PlexCleaner: 3.1.37+a319855c20 19:01:43 [INF] <1> Exit Code : 0 +dotNET: 7.0.304 HandBrakeCLI: HandBrake 20230223192356-5c2b5d2d0-1.6.x MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04 MkvMerge: mkvmerge v77.0 ('Elemental') 64-bit @@ -77,11 +77,11 @@ FfMpeg: ffmpeg version 6.0-0ubuntu1~22.04.sav1.1 Copyright (c) 2000-2023 the FFm ### `ptr727/plexcleaner:debian` ```text -PlexCleaner: 3.1.35+4908684b8f 14:28:12 [INF] <1> Exit Code : 0 -dotNET: 7.0.302 +PlexCleaner: 3.1.37+a319855c20 19:01:42 [INF] <1> Exit Code : 0 +dotNET: 7.0.304 HandBrakeCLI: HandBrake 1.6.1 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04 -MkvMerge: mkvmerge v74.0.0 ('You Oughta Know') 64-bit +MkvMerge: mkvmerge v77.0 ('Elemental') 64-bit FfMpeg: ffmpeg version 5.1.3-1 Copyright (c) 2000-2022 the FFmpeg developers built with gcc 12 (Debian 12.2.0-14) configuration: --prefix=/usr --extra-version=1 --toolchain=hardened --libdir=/usr/lib/x86_64-linux-gnu --incdir=/usr/include/x86_64-linux-gnu --arch=amd64 --enable-gpl --disable-stripping --enable-gnutls --enable-ladspa --enable-libaom --enable-libass --enable-libbluray --enable-libbs2b --enable-libcaca --enable-libcdio --enable-libcodec2 --enable-libdav1d --enable-libflite --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libglslang --enable-libgme --enable-libgsm --enable-libjack --enable-libmp3lame --enable-libmysofa --enable-libopenjpeg --enable-libopenmpt --enable-libopus --enable-libpulse --enable-librabbitmq --enable-librist --enable-librubberband --enable-libshine --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libsrt --enable-libssh --enable-libsvtav1 --enable-libtheora --enable-libtwolame --enable-libvidstab --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libx265 --enable-libxml2 --enable-libxvid --enable-libzimg --enable-libzmq --enable-libzvbi --enable-lv2 --enable-omx --enable-openal --enable-opencl --enable-opengl --enable-sdl2 --disable-sndio --enable-libjxl --enable-pocketsphinx --enable-librsvg --enable-libmfx --enable-libdc1394 --enable-libdrm --enable-libiec61883 --enable-chromaprint --enable-frei0r --enable-libx264 --enable-libplacebo --enable-librav1e --enable-shared libavutil 57. 28.100 / 57. 28.100 libavcodec 59. 37.100 / 59. 37.100 libavformat 59. 27.100 / 59. 27.100 libavdevice 59. 7.100 / 59. 7.100 libavfilter 8. 44.100 / 8. 44.100 libswscale 6. 7.100 / 6. 7.100 libswresample 4. 7.100 / 4. 7.100 libpostproc 56. 6.100 / 56. 6.100 ``` @@ -89,19 +89,19 @@ FfMpeg: ffmpeg version 5.1.3-1 Copyright (c) 2000-2022 the FFmpeg developers bui ### `ptr727/plexcleaner:alpine` ```text -PlexCleaner: 3.1.35+4908684b8f 14:27:57 [INF] <1> Exit Code : 0 -dotNET: 7.0.302 +PlexCleaner: 3.1.37+a319855c20 19:01:36 [INF] <1> Exit Code : 0 +dotNET: 7.0.304 HandBrakeCLI: HandBrake 1.6.1 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04 MkvMerge: mkvmerge v77.0 ('Elemental') 64-bit -FfMpeg: ffmpeg version 6.0 Copyright (c) 2000-2023 the FFmpeg developers built with gcc 13.1.1 (Alpine 13.1.1_git20230520) 20230520 configuration: --prefix=/usr --disable-librtmp --disable-lzma --disable-static --disable-stripping --enable-avfilter --enable-gnutls --enable-gpl --enable-libaom --enable-libass --enable-libbluray --enable-libdav1d --enable-libdrm --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenmpt --enable-libopus --enable-libplacebo --enable-libpulse --enable-librist --enable-libsoxr --enable-libsrt --enable-libssh --enable-libtheora --enable-libv4l2 --enable-libvidstab --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libx264 --enable-libx265 --enable-libxcb --enable-libxml2 --enable-libxvid --enable-libzimg --enable-libzmq --enable-lto --enable-pic --enable-postproc --enable-pthreads --enable-shared --enable-vaapi --enable-vdpau --enable-vulkan --optflags=-O3 --enable-libjxl --enable-libsvtav1 --enable-libvpl libavutil 58. 2.100 / 58. 2.100 libavcodec 60. 3.100 / 60. 3.100 libavformat 60. 3.100 / 60. 3.100 libavdevice 60. 1.100 / 60. 1.100 libavfilter 9. 3.100 / 9. 3.100 libswscale 7. 1.100 / 7. 1.100 libswresample 5. 0.100 / 5. 0.100 libpostproc 57. 1.100 / 57. 1.100 +FfMpeg: ffmpeg version 6.0 Copyright (c) 2000-2023 the FFmpeg developers built with gcc 13.1.1 (Alpine 13.1.1_git20230603) 20230603 configuration: --prefix=/usr --disable-librtmp --disable-lzma --disable-static --disable-stripping --enable-avfilter --enable-gnutls --enable-gpl --enable-libaom --enable-libass --enable-libbluray --enable-libdav1d --enable-libdrm --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenmpt --enable-libopus --enable-libplacebo --enable-libpulse --enable-librist --enable-libsoxr --enable-libsrt --enable-libssh --enable-libtheora --enable-libv4l2 --enable-libvidstab --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libx264 --enable-libx265 --enable-libxcb --enable-libxml2 --enable-libxvid --enable-libzimg --enable-libzmq --enable-lto --enable-pic --enable-postproc --enable-pthreads --enable-shared --enable-vaapi --enable-vdpau --enable-vulkan --optflags=-O3 --enable-libjxl --enable-libsvtav1 --enable-libvpl libavutil 58. 2.100 / 58. 2.100 libavcodec 60. 3.100 / 60. 3.100 libavformat 60. 3.100 / 60. 3.100 libavdevice 60. 1.100 / 60. 1.100 libavfilter 9. 3.100 / 9. 3.100 libswscale 7. 1.100 / 7. 1.100 libswresample 5. 0.100 / 5. 0.100 libpostproc 57. 1.100 / 57. 1.100 ``` ### `ptr727/plexcleaner:arch` ```text -PlexCleaner: 3.1.35+4908684b8f 14:28:25 [INF] <1> Exit Code : 0 +PlexCleaner: 3.1.37+a319855c20 19:01:50 [INF] <1> Exit Code : 0 dotNET: 7.0.105 HandBrakeCLI: HandBrake 1.6.1 MediaInfo: MediaInfo Command line, MediaInfoLib - v23.04 From add6d1d7ece409da8ff4ecfdc5b22c438a90d2f4 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Sun, 18 Jun 2023 13:01:42 -0700 Subject: [PATCH 3/3] Only push if not PR --- .github/workflows/BuildDockerPush.yml | 13 ++++++++----- .github/workflows/BuildGitHubRelease.yml | 5 +++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/BuildDockerPush.yml b/.github/workflows/BuildDockerPush.yml index f5c9b386..2a2b7b9a 100644 --- a/.github/workflows/BuildDockerPush.yml +++ b/.github/workflows/BuildDockerPush.yml @@ -13,10 +13,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -# TODO: How to use env.foo in matrix? -env: - MainBranch: ${{ endsWith(github.ref, 'refs/heads/main') }} - jobs: # Test @@ -144,6 +140,8 @@ jobs: # Login to Docker Hub # https://github.com/marketplace/actions/docker-login - name: Login to Docker Hub + # No need to login if not pushing + if: ${{ (github.event_name != 'pull_request') }} uses: docker/login-action@v2 with: registry: docker.io @@ -163,6 +161,7 @@ jobs: cache-from: type=gha,scope=${{ matrix.cache-scope }} cache-to: type=gha,mode=max,scope=${{ matrix.cache-scope }} file: ${{ matrix.file }} + # Don't push pull requests push: ${{ (github.event_name != 'pull_request') }} # TODO: How to test for secret not null and avoid "null= is not a valid secret" secrets: ${{ matrix.secrets }}=${{ secrets[matrix.secrets] }} @@ -183,7 +182,8 @@ jobs: name: Tool versions runs-on: ubuntu-latest needs: buildpush - + if: ${{ (github.event_name != 'pull_request') }} + strategy: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs @@ -234,6 +234,7 @@ jobs: name: Create README.md runs-on: ubuntu-latest needs: toolversions + if: ${{ (github.event_name != 'pull_request') }} steps: @@ -266,6 +267,7 @@ jobs: name: Update README.md runs-on: ubuntu-latest needs: updatereadme + if: ${{ (github.event_name != 'pull_request') }} steps: @@ -290,6 +292,7 @@ jobs: name: Date badge runs-on: ubuntu-latest needs: buildpush + if: ${{ (github.event_name != 'pull_request') }} steps: diff --git a/.github/workflows/BuildGitHubRelease.yml b/.github/workflows/BuildGitHubRelease.yml index 89214a3e..90c00b0e 100644 --- a/.github/workflows/BuildGitHubRelease.yml +++ b/.github/workflows/BuildGitHubRelease.yml @@ -118,6 +118,8 @@ jobs: # https://github.com/marketplace/actions/upload-a-build-artifact - name: Upload build artifacts + # No need to publish if artifacts if not publishing build + if: ${{ (github.event_name != 'pull_request') }} uses: actions/upload-artifact@v3 with: name: publish @@ -129,6 +131,7 @@ jobs: name: Publish runs-on: ubuntu-latest needs: [ build, version ] + if: ${{ (github.event_name != 'pull_request') }} steps: @@ -146,8 +149,6 @@ jobs: # Create GitHub release # https://github.com/marketplace/actions/automatic-releases - name: Create GitHub release - # Do not push on pull requests - if: ${{ (github.event_name != 'pull_request') }} uses: marvinpinto/action-automatic-releases@latest with: repo_token: ${{ secrets.GITHUB_TOKEN }}