mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-06-29 02:13:36 +02:00
Fix nightly builds (#8870)
This commit is contained in:
parent
2c5573b145
commit
a2babfd0d3
|
@ -32,8 +32,10 @@ jobs:
|
||||||
BuildConfiguration: linux.armhf
|
BuildConfiguration: linux.armhf
|
||||||
Windows.amd64:
|
Windows.amd64:
|
||||||
BuildConfiguration: windows.amd64
|
BuildConfiguration: windows.amd64
|
||||||
MacOS:
|
MacOS.amd64:
|
||||||
BuildConfiguration: macos
|
BuildConfiguration: macos.amd64
|
||||||
|
MacOS.arm64:
|
||||||
|
BuildConfiguration: macos.arm64
|
||||||
Portable:
|
Portable:
|
||||||
BuildConfiguration: portable
|
BuildConfiguration: portable
|
||||||
|
|
||||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -3,7 +3,7 @@ Section: misc
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Jellyfin Team <team@jellyfin.org>
|
Maintainer: Jellyfin Team <team@jellyfin.org>
|
||||||
Build-Depends: debhelper (>= 9),
|
Build-Depends: debhelper (>= 9),
|
||||||
dotnet-sdk-6.0,
|
dotnet-sdk-7.0,
|
||||||
libc6-dev,
|
libc6-dev,
|
||||||
libcurl4-openssl-dev,
|
libcurl4-openssl-dev,
|
||||||
libfontconfig1-dev,
|
libfontconfig1-dev,
|
||||||
|
|
|
@ -13,7 +13,7 @@ RUN yum update -yq \
|
||||||
&& yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git wget
|
&& yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git wget
|
||||||
|
|
||||||
# Install DotNET SDK
|
# Install DotNET SDK
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07/dotnet-sdk-6.0.403-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/253e5af8-41aa-48c6-86f1-39a51b44afdc/5bb2cb9380c5b1a7f0153e0a2775727b/dotnet-sdk-7.0.100-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -12,7 +12,7 @@ RUN dnf update -yq \
|
||||||
&& dnf install -yq @buildsys-build rpmdevtools git dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel systemd wget make
|
&& dnf install -yq @buildsys-build rpmdevtools git dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel systemd wget make
|
||||||
|
|
||||||
# Install DotNET SDK
|
# Install DotNET SDK
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07/dotnet-sdk-6.0.403-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/253e5af8-41aa-48c6-86f1-39a51b44afdc/5bb2cb9380c5b1a7f0153e0a2775727b/dotnet-sdk-7.0.100-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -17,7 +17,7 @@ RUN apt-get update -yqq \
|
||||||
libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
|
libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
|
||||||
|
|
||||||
# Install dotnet repository
|
# Install dotnet repository
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07/dotnet-sdk-6.0.403-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/253e5af8-41aa-48c6-86f1-39a51b44afdc/5bb2cb9380c5b1a7f0153e0a2775727b/dotnet-sdk-7.0.100-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -16,7 +16,7 @@ RUN apt-get update -yqq \
|
||||||
mmv build-essential lsb-release
|
mmv build-essential lsb-release
|
||||||
|
|
||||||
# Install dotnet repository
|
# Install dotnet repository
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07/dotnet-sdk-6.0.403-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/253e5af8-41aa-48c6-86f1-39a51b44afdc/5bb2cb9380c5b1a7f0153e0a2775727b/dotnet-sdk-7.0.100-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -16,7 +16,7 @@ RUN apt-get update -yqq \
|
||||||
mmv build-essential lsb-release
|
mmv build-essential lsb-release
|
||||||
|
|
||||||
# Install dotnet repository
|
# Install dotnet repository
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07/dotnet-sdk-6.0.403-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/253e5af8-41aa-48c6-86f1-39a51b44afdc/5bb2cb9380c5b1a7f0153e0a2775727b/dotnet-sdk-7.0.100-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -9,7 +9,7 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove BuildRequires for dotnet-sdk-6.0, since it's installed manually
|
# Remove BuildRequires for dotnet, since it's installed manually
|
||||||
pushd fedora
|
pushd fedora
|
||||||
|
|
||||||
cp -a jellyfin.spec /tmp/spec.orig
|
cp -a jellyfin.spec /tmp/spec.orig
|
||||||
|
@ -52,7 +52,7 @@ if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
|
|
||||||
cp -a /tmp/spec.orig jellyfin.spec
|
cp -a /tmp/spec.orig jellyfin.spec
|
||||||
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
|
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
|
||||||
|
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,9 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove build-dep for dotnet-sdk-6.0, since it's installed manually
|
# Remove build-dep for dotnet-sdk-7.0, since it's installed manually
|
||||||
cp -a debian/control /tmp/control.orig
|
cp -a debian/control /tmp/control.orig
|
||||||
sed -i '/dotnet-sdk-6.0,/d' debian/control
|
sed -i '/dotnet-sdk-7.0,/d' debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Modify changelog to unstable configuration if IS_UNSTABLE
|
# Modify changelog to unstable configuration if IS_UNSTABLE
|
||||||
|
|
|
@ -9,9 +9,9 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove build-dep for dotnet-sdk-6.0, since it's installed manually
|
# Remove build-dep for dotnet-sdk-7.0, since it's installed manually
|
||||||
cp -a debian/control /tmp/control.orig
|
cp -a debian/control /tmp/control.orig
|
||||||
sed -i '/dotnet-sdk-6.0,/d' debian/control
|
sed -i '/dotnet-sdk-7.0,/d' debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Modify changelog to unstable configuration if IS_UNSTABLE
|
# Modify changelog to unstable configuration if IS_UNSTABLE
|
||||||
|
|
|
@ -9,9 +9,9 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove build-dep for dotnet-sdk-6.0, since it's installed manually
|
# Remove build-dep for dotnet-sdk-7.0, since it's installed manually
|
||||||
cp -a debian/control /tmp/control.orig
|
cp -a debian/control /tmp/control.orig
|
||||||
sed -i '/dotnet-sdk-6.0,/d' debian/control
|
sed -i '/dotnet-sdk-7.0,/d' debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Modify changelog to unstable configuration if IS_UNSTABLE
|
# Modify changelog to unstable configuration if IS_UNSTABLE
|
||||||
|
|
|
@ -9,7 +9,7 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove BuildRequires for dotnet-sdk-6.0, since it's installed manually
|
# Remove BuildRequires for dotnet, since it's installed manually
|
||||||
pushd fedora
|
pushd fedora
|
||||||
|
|
||||||
cp -a jellyfin.spec /tmp/spec.orig
|
cp -a jellyfin.spec /tmp/spec.orig
|
||||||
|
@ -52,7 +52,7 @@ if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
|
|
||||||
cp -a /tmp/spec.orig jellyfin.spec
|
cp -a /tmp/spec.orig jellyfin.spec
|
||||||
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
|
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
|
||||||
|
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,9 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove build-dep for dotnet-sdk-6.0, since it's installed manually
|
# Remove build-dep for dotnet-sdk-7.0, since it's installed manually
|
||||||
cp -a debian/control /tmp/control.orig
|
cp -a debian/control /tmp/control.orig
|
||||||
sed -i '/dotnet-sdk-6.0,/d' debian/control
|
sed -i '/dotnet-sdk-7.0,/d' debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Modify changelog to unstable configuration if IS_UNSTABLE
|
# Modify changelog to unstable configuration if IS_UNSTABLE
|
||||||
|
|
|
@ -9,9 +9,9 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove build-dep for dotnet-sdk-6.0, since it's installed manually
|
# Remove build-dep for dotnet-sdk-7.0, since it's installed manually
|
||||||
cp -a debian/control /tmp/control.orig
|
cp -a debian/control /tmp/control.orig
|
||||||
sed -i '/dotnet-sdk-6.0,/d' debian/control
|
sed -i '/dotnet-sdk-7.0,/d' debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Modify changelog to unstable configuration if IS_UNSTABLE
|
# Modify changelog to unstable configuration if IS_UNSTABLE
|
||||||
|
|
|
@ -9,9 +9,9 @@ set -o xtrace
|
||||||
pushd ${SOURCE_DIR}
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
if [[ ${IS_DOCKER} == YES ]]; then
|
if [[ ${IS_DOCKER} == YES ]]; then
|
||||||
# Remove build-dep for dotnet-sdk-6.0, since it's installed manually
|
# Remove build-dep for dotnet-sdk-7.0, since it's installed manually
|
||||||
cp -a debian/control /tmp/control.orig
|
cp -a debian/control /tmp/control.orig
|
||||||
sed -i '/dotnet-sdk-6.0,/d' debian/control
|
sed -i '/dotnet-sdk-7.0,/d' debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Modify changelog to unstable configuration if IS_UNSTABLE
|
# Modify changelog to unstable configuration if IS_UNSTABLE
|
||||||
|
|
|
@ -27,7 +27,7 @@ BuildRequires: systemd
|
||||||
BuildRequires: libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel
|
BuildRequires: libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel
|
||||||
# Requirements not packaged in RHEL 7 main repos, added via Makefile
|
# Requirements not packaged in RHEL 7 main repos, added via Makefile
|
||||||
# https://packages.microsoft.com/rhel/7/prod/
|
# https://packages.microsoft.com/rhel/7/prod/
|
||||||
BuildRequires: dotnet-runtime-6.0, dotnet-sdk-6.0
|
BuildRequires: dotnet-runtime-7.0, dotnet-sdk-7.0
|
||||||
Requires: %{name}-server = %{version}-%{release}, %{name}-web = %{version}-%{release}
|
Requires: %{name}-server = %{version}-%{release}, %{name}-web = %{version}-%{release}
|
||||||
|
|
||||||
# Temporary (hopefully?) fix for https://github.com/jellyfin/jellyfin/issues/7471
|
# Temporary (hopefully?) fix for https://github.com/jellyfin/jellyfin/issues/7471
|
||||||
|
|
Loading…
Reference in a new issue