lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nightly builds (#8870)

Browse Source
This commit is contained in:
Bond-009 2022-12-08 01:51:29 +01:00 committed by GitHub
parent 2c5573b145
commit a2babfd0d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/azure-pipelines-package.yml
View File

@ -32,8 +32,10 @@ jobs:
BuildConfiguration: linux.armhf
Windows.amd64:
BuildConfiguration: windows.amd64
MacOS:
BuildConfiguration: macos
MacOS.amd64:
BuildConfiguration: macos.amd64
MacOS.arm64:
BuildConfiguration: macos.arm64
Portable:
BuildConfiguration: portable

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Jellyfin Team <team@jellyfin.org>
Build-Depends: debhelper (>= 9),
dotnet-sdk-6.0,
dotnet-sdk-7.0,
libc6-dev,
libcurl4-openssl-dev,
libfontconfig1-dev,

2
deployment/Dockerfile.centos.amd64
View File

@ -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
# 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 \
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

2
deployment/Dockerfile.fedora.amd64
View File

@ -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
# 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 \
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

2
deployment/Dockerfile.ubuntu.amd64
View File

@ -17,7 +17,7 @@ RUN apt-get update -yqq \
libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
# 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 \
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

2
deployment/Dockerfile.ubuntu.arm64
View File

@ -16,7 +16,7 @@ RUN apt-get update -yqq \
mmv build-essential lsb-release
# 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 \
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

2
deployment/Dockerfile.ubuntu.armhf
View File

@ -16,7 +16,7 @@ RUN apt-get update -yqq \
mmv build-essential lsb-release
# 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 \
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

4
deployment/build.centos.amd64
View File

@ -9,7 +9,7 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
cp -a jellyfin.spec /tmp/spec.orig
@ -52,7 +52,7 @@ if [[ ${IS_DOCKER} == YES ]]; then
cp -a /tmp/spec.orig jellyfin.spec
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
popd
fi

4
deployment/build.debian.amd64
View File

@ -9,9 +9,9 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
sed -i '/dotnet-sdk-6.0,/d' debian/control
sed -i '/dotnet-sdk-7.0,/d' debian/control
fi
# Modify changelog to unstable configuration if IS_UNSTABLE

4
deployment/build.debian.arm64
View File

@ -9,9 +9,9 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
sed -i '/dotnet-sdk-6.0,/d' debian/control
sed -i '/dotnet-sdk-7.0,/d' debian/control
fi
# Modify changelog to unstable configuration if IS_UNSTABLE

4
deployment/build.debian.armhf
View File

@ -9,9 +9,9 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
sed -i '/dotnet-sdk-6.0,/d' debian/control
sed -i '/dotnet-sdk-7.0,/d' debian/control
fi
# Modify changelog to unstable configuration if IS_UNSTABLE

4
deployment/build.fedora.amd64
View File

@ -9,7 +9,7 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
cp -a jellyfin.spec /tmp/spec.orig
@ -52,7 +52,7 @@ if [[ ${IS_DOCKER} == YES ]]; then
cp -a /tmp/spec.orig jellyfin.spec
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
popd
fi

4
deployment/build.ubuntu.amd64
View File

@ -9,9 +9,9 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
sed -i '/dotnet-sdk-6.0,/d' debian/control
sed -i '/dotnet-sdk-7.0,/d' debian/control
fi
# Modify changelog to unstable configuration if IS_UNSTABLE

4
deployment/build.ubuntu.arm64
View File

@ -9,9 +9,9 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
sed -i '/dotnet-sdk-6.0,/d' debian/control
sed -i '/dotnet-sdk-7.0,/d' debian/control
fi
# Modify changelog to unstable configuration if IS_UNSTABLE

4
deployment/build.ubuntu.armhf
View File

@ -9,9 +9,9 @@ set -o xtrace
pushd ${SOURCE_DIR}
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
sed -i '/dotnet-sdk-6.0,/d' debian/control
sed -i '/dotnet-sdk-7.0,/d' debian/control
fi
# Modify changelog to unstable configuration if IS_UNSTABLE

2
fedora/jellyfin.spec
View File

@ -27,7 +27,7 @@ BuildRequires: systemd
BuildRequires: libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel
# Requirements not packaged in RHEL 7 main repos, added via Makefile
# 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}
# Temporary (hopefully?) fix for https://github.com/jellyfin/jellyfin/issues/7471