From 2a6ea45ee1106a46c9947995d3b4e314ce68c495 Mon Sep 17 00:00:00 2001 From: crobibero Date: Fri, 9 Oct 2020 08:43:59 -0600 Subject: [PATCH 1/2] Run npm install task --- .ci/azure-pipelines-api-client.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml index 132101444..8b03b233f 100644 --- a/.ci/azure-pipelines-api-client.yml +++ b/.ci/azure-pipelines-api-client.yml @@ -28,6 +28,12 @@ jobs: inputs: script: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar" + - task: Npm@1 + displayName: 'Install npm dependencies' + inputs: + command: install + workingDir: ./apiclient/generated/typescript/axios + # Generate npm api client # Unstable - task: CmdLine@2 From 60c0cc1d1cd1b6ebd58b47021652782ceddf232e Mon Sep 17 00:00:00 2001 From: crobibero Date: Fri, 9 Oct 2020 08:51:22 -0600 Subject: [PATCH 2/2] Fix feed name and url --- .ci/azure-pipelines-api-client.yml | 2 +- apiclient/templates/typescript/axios/generate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml index 8b03b233f..35a494cd6 100644 --- a/.ci/azure-pipelines-api-client.yml +++ b/.ci/azure-pipelines-api-client.yml @@ -48,7 +48,7 @@ jobs: inputs: command: publish publishRegistry: useFeed - publishFeed: 'unstable@Local' + publishFeed: 'jellyfin/unstable' workingDir: ./apiclient/generated/typescript/axios # Stable diff --git a/apiclient/templates/typescript/axios/generate.sh b/apiclient/templates/typescript/axios/generate.sh index 360fe9f33..8c4d74282 100644 --- a/apiclient/templates/typescript/axios/generate.sh +++ b/apiclient/templates/typescript/axios/generate.sh @@ -4,7 +4,7 @@ artifactsDirectory="${1}" buildNumber="${2}" if [[ -n ${buildNumber} ]]; then # Unstable build - additionalProperties=",snapshotVersion=-SNAPSHOT.${buildNumber},npmRepository=https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable%40Local/npm/registry/" + additionalProperties=",snapshotVersion=-SNAPSHOT.${buildNumber},npmRepository=https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable/npm/registry/" else # Stable build additionalProperties=""