From 7e7b6c2fd9a9d6eab941a781e1ee38691c339f25 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Tue, 25 Jun 2024 16:24:53 -0400 Subject: [PATCH] [20] Update workflow (#2137) --- .github/workflows/increment-build.yml | 61 ++++++++++++++------------- CHANGELOG | 4 +- VERSION | 2 +- defaults/chart/letterboxd.yml | 4 -- defaults/templates.yml | 3 +- docs/defaults/chart/letterboxd.md | 3 +- requirements.txt | 6 +-- 7 files changed, 42 insertions(+), 41 deletions(-) diff --git a/.github/workflows/increment-build.yml b/.github/workflows/increment-build.yml index c1ffc4e0..2a3e0ed3 100644 --- a/.github/workflows/increment-build.yml +++ b/.github/workflows/increment-build.yml @@ -6,9 +6,39 @@ on: types: [closed] jobs: - increment-build: + + verify-changes: runs-on: ubuntu-latest if: github.base_ref == 'nightly' && github.event.pull_request.merged + outputs: + build: ${{ steps.list-changes.outputs.build }} + steps: + + - name: Check Out Repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: nightly + + - name: Get changes + id: get-changes + run: echo "files=$(git diff --name-only HEAD^ | xargs)" >> $GITHUB_OUTPUT + + - name: List changed files + id: list-changes + run: | + for file in ${{ steps.get-changes.outputs.files }}; do + if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then + echo "$file will trigger docker build" + echo "build=true" >> $GITHUB_OUTPUT + else + echo "$file will not trigger docker build" + fi + done + + increment-build: + runs-on: ubuntu-latest + needs: [ verify-changes ] outputs: version: ${{ steps.update-version.outputs.version }} build-value: ${{ steps.update-version.outputs.build-value }} @@ -76,35 +106,6 @@ jobs: git commit -m "${new_msg}" --amend git push origin nightly --force-with-lease - verify-changes: - runs-on: ubuntu-latest - needs: [ increment-build ] - outputs: - build: ${{ steps.list-changes.outputs.build }} - steps: - - - name: Check Out Repo - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: nightly - - - name: Get changes - id: get-changes - run: echo "files=$(git diff --name-only HEAD^ | xargs)" >> $GITHUB_OUTPUT - - - name: List changed files - id: list-changes - run: | - for file in ${{ steps.get-changes.outputs.files }}; do - if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then - echo "$file will trigger docker build" - echo "build=true" >> $GITHUB_OUTPUT - else - echo "$file will not trigger docker build" - fi - done - docker-build-nightly: runs-on: ubuntu-latest needs: [ increment-build, verify-changes ] diff --git a/CHANGELOG b/CHANGELOG index 8b7260bc..ac19dc30 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ # Requirements Update (requirements will need to be reinstalled) -Added tenacity requirement at 8.4.1 +Added tenacity requirement at 8.4.2 +Update PlexAPI requirement to 4.15.14 Update psutil requirement to 6.0.0 +Update setuptools requirement to 70.1.0 # Removed Features diff --git a/VERSION b/VERSION index 06888525..a3d0eeac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.2-build19 +2.0.2-build20 diff --git a/defaults/chart/letterboxd.yml b/defaults/chart/letterboxd.yml index 6fe48536..dcde9e5e 100644 --- a/defaults/chart/letterboxd.yml +++ b/defaults/chart/letterboxd.yml @@ -17,10 +17,6 @@ external_templates: templates: letterboxd_list: letterboxd_list: https://letterboxd.com/<>/list/<> - default: - cache_builders: 1 - cache_builders_<>: <> - cache_builders: <>>> collections: "Letterboxd Top 250": diff --git a/defaults/templates.yml b/defaults/templates.yml index b48b9e72..4f51ef3a 100644 --- a/defaults/templates.yml +++ b/defaults/templates.yml @@ -292,9 +292,10 @@ templates: collection_order: custom collection_order_<>: <> cache_builders: 1 + cache_builders_<>: <> collection_order: <>>> sync_mode: <>>> - cache_builders: <> + cache_builders: <>>> other_collection: default: diff --git a/docs/defaults/chart/letterboxd.md b/docs/defaults/chart/letterboxd.md index b0386bb4..4e693169 100644 --- a/docs/defaults/chart/letterboxd.md +++ b/docs/defaults/chart/letterboxd.md @@ -66,7 +66,8 @@ work. Any value not specified will use its default value if it has one if not it | `sync_mode_<>`1 | **Description:** Changes the Sync Mode of the specified key's collection.
**Default:** `sync_mode`
**Values:**
`sync`Add and Remove Items based on Builders
`append`Only Add Items based on Builders
| | `collection_order` | **Description:** Changes the Collection Order for all collections in a Defaults file.
**Default:** `custom`
**Values:**
`release`Order Collection by Release Dates
`alpha`Order Collection Alphabetically
`custom`Order Collection Via the Builder Order
[Any `plex_search` Sort Option](../../files/builders/plex.md#sort-options)Order Collection by any `plex_search` Sort Option
| | `collection_order_<>`1 | **Description:** Changes the Collection Order of the specified key's collection.
**Default:** `collection_order`
**Values:**
`release`Order Collection by Release Dates
`alpha`Order Collection Alphabetically
`custom`Order Collection Via the Builder Order
[Any `plex_search` Sort Option](../../files/builders/plex.md#sort-options)Order Collection by any `plex_search` Sort Option
| - | `cache_builders_<>` | **Description:** Changes the Builder Cache of the specified key's collection.
**Default:** `1`
**Values:** number 0 or greater | + | `cache_builders` | **Description:** Changes the Builder Cache for all collections in a Defaults file.
**Default:** `1`
**Values:** number 0 or greater | + | `cache_builders_<>` | **Description:** Changes the Builder Cache of the specified key's collection.
**Default:** `1`
**Values:** number 0 or greater | 1. Each default collection has a `key` that when calling to effect a specific collection you must replace `<>` with when calling. diff --git a/requirements.txt b/requirements.txt index 04d282db..cb0e34ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,13 +4,13 @@ lxml==5.2.2 num2words==0.5.13 pathvalidate==3.2.0 pillow==10.3.0 -PlexAPI==4.15.13 +PlexAPI==4.15.14 psutil==6.0.0 python-dotenv==1.0.1 python-dateutil==2.9.0.post0 requests==2.32.3 -tenacity==8.4.1 +tenacity==8.4.2 ruamel.yaml==0.18.6 schedule==1.2.2 -setuptools==70.0.0 +setuptools==70.1.0 tmdbapis==1.2.16 \ No newline at end of file