Compare commits

...

4 Commits

Author SHA1 Message Date
Joshua M. Boniface
2647935b96 Merge pull request #4669 from MrTimscampi/fix-npm-public
Fix NPM command in CI

(cherry picked from commit 8976b22ac4)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2020-12-05 01:36:00 -05:00
Joshua M. Boniface
2a4023c6c7 Merge pull request #4667 from joshuaboniface/fix-nuget-ci
Remove obsolete erroring command

(cherry picked from commit f2c2beca0f)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2020-12-05 01:35:18 -05:00
Joshua M. Boniface
2a2630098b Merge pull request #4662 from joshuaboniface/fix-bump-version
Fix bad do in bump_version

(cherry picked from commit e3a1991fe9)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2020-12-05 01:12:47 -05:00
Joshua M. Boniface
79472dce70 Bump version to 10.7.0~rc1 2020-12-04 21:03:57 -05:00
7 changed files with 10 additions and 14 deletions

View File

@@ -52,7 +52,8 @@ jobs:
- task: Npm@1 - task: Npm@1
displayName: 'Publish stable typescript axios client' displayName: 'Publish stable typescript axios client'
inputs: inputs:
command: publish command: custom
customCommand: publish --access public
publishRegistry: useExternalRegistry publishRegistry: useExternalRegistry
publishEndpoint: 'jellyfin-bot for NPM' publishEndpoint: 'jellyfin-bot for NPM'
workingDir: ./apiclient/generated/typescript/axios workingDir: ./apiclient/generated/typescript/axios

View File

@@ -221,12 +221,6 @@ jobs:
pathToPublish: $(Build.ArtifactStagingDirectory) pathToPublish: $(Build.ArtifactStagingDirectory)
artifactName: Jellyfin Nuget Packages artifactName: Jellyfin Nuget Packages
- task: NuGetAuthenticate@0
displayName: 'Authenticate to stable Nuget feed'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
inputs:
nuGetServiceConnections: 'NugetOrg'
- task: NuGetCommand@2 - task: NuGetCommand@2
displayName: 'Push Nuget packages to stable feed' displayName: 'Push Nuget packages to stable feed'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v') condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')

View File

@@ -1,7 +1,7 @@
--- ---
# We just wrap `build` so this is really it # We just wrap `build` so this is really it
name: "jellyfin" name: "jellyfin"
version: "10.7.0" version: "10.7.0~rc1"
packages: packages:
- debian.amd64 - debian.amd64
- debian.arm64 - debian.arm64

View File

@@ -49,7 +49,6 @@ sed -i "s/${old_version_sed}/${new_version}/g" ${build_file}
# update nuget package version # update nuget package version
for subproject in ${jellyfin_subprojects[@]}; do for subproject in ${jellyfin_subprojects[@]}; do
do
echo ${subproject} echo ${subproject}
# Parse the version from the *.csproj file # Parse the version from the *.csproj file
old_version="$( old_version="$(

6
debian/changelog vendored
View File

@@ -1,8 +1,8 @@
jellyfin-server (10.7.0-1) unstable; urgency=medium jellyfin-server (10.7.0~rc1) unstable; urgency=medium
* Forthcoming stable release * New upstream version 10.7.0-rc1; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.0-rc1
-- Jellyfin Packaging Team <packaging@jellyfin.org> Mon, 27 Jul 2020 19:09:45 -0400 -- Jellyfin Packaging Team <packaging@jellyfin.org> Fri, 04 Dec 2020 21:01:58 -0500
jellyfin-server (10.6.0-2) unstable; urgency=medium jellyfin-server (10.6.0-2) unstable; urgency=medium

View File

@@ -5,7 +5,7 @@ Homepage: https://jellyfin.org
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Package: jellyfin Package: jellyfin
Version: 10.7.0 Version: 10.7.0~rc1
Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org> Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
Depends: jellyfin-server, jellyfin-web Depends: jellyfin-server, jellyfin-web
Description: Provides the Jellyfin Free Software Media System Description: Provides the Jellyfin Free Software Media System

View File

@@ -7,7 +7,7 @@
%endif %endif
Name: jellyfin Name: jellyfin
Version: 10.7.0 Version: 10.7.0~rc1
Release: 1%{?dist} Release: 1%{?dist}
Summary: The Free Software Media System Summary: The Free Software Media System
License: GPLv3 License: GPLv3
@@ -137,6 +137,8 @@ fi
%systemd_postun_with_restart jellyfin.service %systemd_postun_with_restart jellyfin.service
%changelog %changelog
* Fri Dec 04 2020 Jellyfin Packaging Team <packaging@jellyfin.org>
- New upstream version 10.7.0-rc1; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.0-rc1
* Mon Jul 27 2020 Jellyfin Packaging Team <packaging@jellyfin.org> * Mon Jul 27 2020 Jellyfin Packaging Team <packaging@jellyfin.org>
- Forthcoming stable release - Forthcoming stable release
* Mon Mar 23 2020 Jellyfin Packaging Team <packaging@jellyfin.org> * Mon Mar 23 2020 Jellyfin Packaging Team <packaging@jellyfin.org>