From 5251a5ca795611bac403e652144e61d391ecea49 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 31 Aug 2019 21:32:11 -0400 Subject: [PATCH 1/2] Allow selecting web branch and fix Docker sed --- bump_version | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bump_version b/bump_version index 398caee15c..5900208647 100755 --- a/bump_version +++ b/bump_version @@ -24,7 +24,11 @@ fi shared_version_file="./SharedVersion.cs" build_file="./build.yaml" -web_branch="$( git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )" +if [[ -z $2 ]]; then + web_branch="$( git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )" +else + web_branch="$2" +fi # Initialize submodules git submodule update --init --recursive @@ -80,7 +84,7 @@ fi # Set the Dockerfile web version to the specified new_version old_version="$( grep "JELLYFIN_WEB_VERSION=" Dockerfile \ - | sed -E 's/ARG JELLYFIN_WEB_VERSION=([0-9\.]+[-a-z0-9]*)/\1/' + | sed -E 's/ARG JELLYFIN_WEB_VERSION=v([0-9\.]+[-a-z0-9]*)/\1/' )" echo $old_version From 742102b5416a42ee6c9496f98758db553a6e27d0 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 31 Aug 2019 21:39:10 -0400 Subject: [PATCH 2/2] Bump version to 10.4.0 --- Dockerfile | 2 +- Dockerfile.arm | 2 +- Dockerfile.arm64 | 2 +- MediaBrowser.WebDashboard/jellyfin-web | 2 +- SharedVersion.cs | 4 ++-- build.yaml | 2 +- deployment/debian-package-x64/pkg-src/changelog | 6 ++++++ deployment/fedora-package-x64/pkg-src/jellyfin.spec | 4 +++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a19ebcf2eb..d8f7ab314a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update \ COPY --from=ffmpeg / / COPY --from=builder /jellyfin /jellyfin -ARG JELLYFIN_WEB_VERSION=v10.3.7 +ARG JELLYFIN_WEB_VERSION=v10.4.0 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ && rm -rf /jellyfin/jellyfin-web \ && mv jellyfin-web-* /jellyfin/jellyfin-web diff --git a/Dockerfile.arm b/Dockerfile.arm index 651bdeff49..2b1c6bb62b 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -26,7 +26,7 @@ RUN apt-get update \ && chmod 777 /cache /config /media COPY --from=builder /jellyfin /jellyfin -ARG JELLYFIN_WEB_VERSION=v10.3.7 +ARG JELLYFIN_WEB_VERSION=v10.4.0 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ && rm -rf /jellyfin/jellyfin-web \ && mv jellyfin-web-* /jellyfin/jellyfin-web diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f6bd81e4c2..5ebc82ebc5 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -26,7 +26,7 @@ RUN apt-get update \ && chmod 777 /cache /config /media COPY --from=builder /jellyfin /jellyfin -ARG JELLYFIN_WEB_VERSION=v10.3.7 +ARG JELLYFIN_WEB_VERSION=v10.4.0 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ && rm -rf /jellyfin/jellyfin-web \ && mv jellyfin-web-* /jellyfin/jellyfin-web diff --git a/MediaBrowser.WebDashboard/jellyfin-web b/MediaBrowser.WebDashboard/jellyfin-web index 1d0fd79eb1..867a5e664c 160000 --- a/MediaBrowser.WebDashboard/jellyfin-web +++ b/MediaBrowser.WebDashboard/jellyfin-web @@ -1 +1 @@ -Subproject commit 1d0fd79eb1e4d0bf6a9f62f769a951970383bcf0 +Subproject commit 867a5e664cb968602b50dee4874fcb961eed4803 diff --git a/SharedVersion.cs b/SharedVersion.cs index 500e6fe551..5f3fd8e508 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("10.3.7")] -[assembly: AssemblyFileVersion("10.3.7")] +[assembly: AssemblyVersion("10.4.0")] +[assembly: AssemblyFileVersion("10.4.0")] diff --git a/build.yaml b/build.yaml index 2d4bc29f43..3cfccd3370 100644 --- a/build.yaml +++ b/build.yaml @@ -1,7 +1,7 @@ --- # We just wrap `build` so this is really it name: "jellyfin" -version: "10.3.7" +version: "10.4.0" packages: - debian-package-x64 - debian-package-armhf diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog index aa15827a72..54d4cffbae 100644 --- a/deployment/debian-package-x64/pkg-src/changelog +++ b/deployment/debian-package-x64/pkg-src/changelog @@ -1,3 +1,9 @@ +jellyfin (10.4.0-1) unstable; urgency=medium + + * New upstream version 10.4.0; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.4.0 + + -- Jellyfin Packaging Team Sat, 31 Aug 2019 21:38:56 -0400 + jellyfin (10.3.7-1) unstable; urgency=medium * New upstream version 10.3.7; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.7 diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec index 3fa5e397a4..d591a54e1f 100644 --- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec +++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec @@ -7,7 +7,7 @@ %endif Name: jellyfin -Version: 10.3.7 +Version: 10.4.0 Release: 1%{?dist} Summary: The Free Software Media Browser License: GPLv2 @@ -140,6 +140,8 @@ fi %systemd_postun_with_restart jellyfin.service %changelog +* Sat Aug 31 2019 Jellyfin Packaging Team +- New upstream version 10.4.0; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.4.0 * Wed Jul 24 2019 Jellyfin Packaging Team - New upstream version 10.3.7; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.7 * Sat Jul 06 2019 Jellyfin Packaging Team