Fix repository and artifact names (adapt to new repo location)

This commit is contained in:
Maxr1998 2020-08-18 18:07:35 +02:00
parent 5db3037ad4
commit ad71305cc1
No known key found for this signature in database
GPG Key ID: 3BA0CD3A11CDF7B8
3 changed files with 14 additions and 14 deletions

View File

@ -73,7 +73,7 @@ jobs:
displayName: 'Publish APKs'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
ArtifactName: 'jellyfin-android-next'
ArtifactName: 'jellyfin-android'
publishLocation: 'Container'
- job: Publish
@ -93,7 +93,7 @@ jobs:
displayName: 'Download APKs'
inputs:
source: 'current'
artifact: 'jellyfin-android-next'
artifact: 'jellyfin-android'
path: '$(System.ArtifactsDirectory)'
runVersion: 'latest'
@ -103,7 +103,7 @@ jobs:
inputs:
secureFile: 'keystore'
- script: '$(find / -name apksigner -print -quit) sign --ks ${KEYSTORE_SECUREFILEPATH} --ks-pass pass:${PASSWORD} --out ${SYSTEM_ARTIFACTSDIRECTORY}/jellyfin-android-next-${TAG}-release.apk ${SYSTEM_ARTIFACTSDIRECTORY}/jellyfin-android-next-${TAG}-release-unsigned.apk'
- script: '$(find / -name apksigner -print -quit) sign --ks ${KEYSTORE_SECUREFILEPATH} --ks-pass pass:${PASSWORD} --out ${SYSTEM_ARTIFACTSDIRECTORY}/jellyfin-android-${TAG}-release.apk ${SYSTEM_ARTIFACTSDIRECTORY}/jellyfin-android-${TAG}-release-unsigned.apk'
displayName: 'Sign Release APK'
env:
PASSWORD: $(KeyStorePassword)
@ -112,13 +112,13 @@ jobs:
displayName: 'Remove Unsigned APK'
inputs:
sourceFolder: '$(System.ArtifactsDirectory)'
contents: 'jellyfin-android-next-${TAG}-release-unsigned.apk'
contents: 'jellyfin-android-${TAG}-release-unsigned.apk'
- task: GithubRelease@0
displayName: 'GitHub Upload'
inputs:
gitHubConnection: Jellyfin Release Download
repositoryName: jellyfin/jellyfin-android-next
repositoryName: jellyfin/jellyfin-android
assets: '$(System.ArtifactsDirectory)/*.apk'
action: 'edit'
assetUploadMode: 'replace'
@ -129,10 +129,10 @@ jobs:
sshEndpoint: repository
sourceFolder: '$(System.ArtifactsDirectory)'
contents: '**'
targetFolder: '/srv/repository/releases/client/android-next/versions/$(TAG)'
targetFolder: '/srv/repository/releases/client/android/versions/$(TAG)'
- task: SSH@0
inputs:
sshEndpoint: repository
runOptions: 'inline'
inline: 'cd /srv/repository/releases/client/android-next && rm -rf *.apk && ln -s versions/$(TAG)/jellyfin-android-next-$(TAG)-*.apk .'
inline: 'cd /srv/repository/releases/client/android && rm -rf *.apk && ln -s versions/$(TAG)/jellyfin-android-$(TAG)-*.apk .'

View File

@ -7,11 +7,11 @@
<img alt="Logo Banner" src="https://raw.githubusercontent.com/jellyfin/jellyfin-ux/master/branding/SVG/banner-logo-solid.svg?sanitize=true"/>
<br/>
<br/>
<a href="https://github.com/jellyfin/jellyfin-android-next">
<img alt="GPL 2.0 License" src="https://img.shields.io/github/license/jellyfin/jellyfin-android-next.svg"/>
<a href="https://github.com/jellyfin/jellyfin-android">
<img alt="GPL 2.0 License" src="https://img.shields.io/github/license/jellyfin/jellyfin-android.svg"/>
</a>
<a href="https://github.com/jellyfin/jellyfin-android-next/releases">
<img alt="Current Release" src="https://img.shields.io/github/release/jellyfin/jellyfin-android-next.svg"/>
<a href="https://github.com/jellyfin/jellyfin-android/releases">
<img alt="Current Release" src="https://img.shields.io/github/release/jellyfin/jellyfin-android.svg"/>
</a>
<a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-android-next/?utm_source=widget">
<img alt="Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-android-next/svg-badge.svg"/>
@ -53,8 +53,8 @@ Most of the translations can be found in the [web client](https://translate.jell
1. Clone or download this repository
```sh
git clone https://github.com/jellyfin/jellyfin-android-next.git
cd jellyfin-android-next
git clone https://github.com/jellyfin/jellyfin-android.git
cd jellyfin-android
```
2. Open the project in Android Studio and run it from there or build an APK directly through Gradle:

View File

@ -17,7 +17,7 @@ android {
targetSdkVersion(30)
versionName = "2.1.0-alpha"
versionCode = getVersionCode(versionName)
setProperty("archivesBaseName", "jellyfin-android-next-v$versionName")
setProperty("archivesBaseName", "jellyfin-android-v$versionName")
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {