Browse Source

specify client specifically instead of through template

crobibero 4 năm trước cách đây
mục cha
commit
7d992798fd

+ 2 - 2
.ci/azure-pipelines-api-client.yml

@@ -38,7 +38,7 @@ jobs:
     displayName: 'Build unstable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
     inputs:
-      script: 'bash ./apiclient/templates/typescript/unstable.sh axios'
+      script: 'bash ./apiclient/templates/typescript/axios/unstable.sh'
 
     - task: Npm@1
     displayName: 'Publish unstable typescript axios client'
@@ -58,7 +58,7 @@ jobs:
     displayName: 'Build stable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
     inputs:
-      script: 'bash ./apiclient/templates/typescript/stable.sh axios'
+      script: 'bash ./apiclient/templates/typescript/axios/stable.sh'
 
     - task: Npm@1
     displayName: 'Publish stable typescript axios client'

+ 3 - 3
apiclient/templates/typescript/package.mustache → apiclient/templates/typescript/axios/package.mustache

@@ -1,10 +1,10 @@
 {
-  "name": "@jellyfin/client-{{npmName}}",
+  "name": "@jellyfin/client-axios",
   "version": "10.7.0{{snapshotVersion}}",
-  "description": "Jellyfin api client using {{npmName}}",
+  "description": "Jellyfin api client using axios",
   "author": "Jellyfin Contributors",
   "keywords": [
-    "{{npmName}}",
+    "axios",
     "typescript",
     "jellyfin"
   ],

+ 4 - 5
apiclient/templates/typescript/stable.sh → apiclient/templates/typescript/axios/stable.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-CLIENT=$1
 java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
-    --generator-name typescript-${CLIENT} \
-    --output ./apiclient/generated/typescript/${CLIENT}  \
-    --template-dir ./apiclient/templates/typescript \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}"
+    --additional-properties=useSingleRequestParameter="true",npmName="axios"

+ 9 - 0
apiclient/templates/typescript/axios/unstable.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+java -jar openapi-generator-cli.jar generate \
+    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
+    --ignore-file-override ./apiclient/.openapi-generator-ignore \
+    --additional-properties=useSingleRequestParameter="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"

+ 0 - 10
apiclient/templates/typescript/unstable.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-CLIENT=$1
-java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
-    --generator-name typescript-${CLIENT} \
-    --output ./apiclient/generated/typescript/${CLIENT}  \
-    --template-dir ./apiclient/templates/typescript \
-    --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"