Update CI

Author: jellejurre

.github/workflows/ci.yaml

@@ -1,44 +1,70 @@
 on:
   repository_dispatch:
-    types: [spec_release]
-#on: push
+    types: [release]
+  workflow_dispatch:
+    inputs:
+      json:
+        description: 'Passed json from repository_dispatch'
+        required: true
+        type: string
+      version_postfix:
+        description: 'Additional string to concatenate onto the existing version before release'
+        required: false
+        type: string
+        default: ''
 
 name: Generate VRChat API SDK
 
 jobs:
   generate:
     runs-on: ubuntu-latest
     name: Generate VRChat API SDK
+    env:
+      ARTIFACT_NAME: "openapi.yaml"
+      INPUT: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload || inputs.json }}
+      SPEC_URL: ${{ fromJSON(github.event_name == 'repository_dispatch' && github.event.client_payload || inputs.json)['artifacts']['openapi-legacy.yaml'] }}
+      PASSED_VERSION: ${{ fromJSON(github.event_name == 'repository_dispatch' && github.event.client_payload || inputs.json)['version'] }}
+      VERSION_POSTPEND: ${{ github.event_name == 'workflow_dispatch' && inputs.version_postfix || '' }}
     steps:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
+
       - uses: actions/checkout@v3
+
       - name: 'Cache node_modules'
         uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-node-v16-${{ hashFiles('**/generate.sh') }}
           restore-keys: |
             ${{ runner.os }}-node-v16
+
       - name: Install OpenAPI Generator CLI
         run: npm install @openapitools/openapi-generator-cli
+
       - name: Set OpenAPI Generator version
         run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 6.2.1
-      - name: Generate SDK Client
-        run: bash ./generate.sh
+
+      - name: Download Specification
+        run: wget "${SPEC_URL}" '--output-document' "${ARTIFACT_NAME}"
+
       - name: Check version number
         run: |
-          echo "spec_version=$(grep "version =" build.gradle | cut -d "'" -f 2)" >> $GITHUB_ENV
-      - name: Print version number
-        run: echo ${{ env.spec_version }}
+          vrchat_sdk_version=$(( ${PASSED_VERSION%%.*} + 1)).${PASSED_VERSION#*.}${VERSION_POSTPEND}
+          echo "Version is: ${vrchat_sdk_version}" 
+          echo "vrchat_sdk_version=$vrchat_sdk_version" >> $GITHUB_ENV 
+
+      - name: Generate SDK Client
+        run: bash ./generate.sh "${ARTIFACT_NAME}" "${vrchat_sdk_version}"
+
       - name: Deploy SDK back into main branch and make tag
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: main
           folder: .
-          commit-message: "Upgrade Java SDK to spec ${{ env.spec_version }}"
-          tag: ${{ env.spec_version }}
+          commit-message: "Upgrade Java SDK to spec ${{vrchat_sdk_version}}"
+          tag: ${{vrchat_sdk_version}}
 
 #  gradle:
 #    runs-on: ubuntu-latest

generate.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-npm install @openapitools/openapi-generator-cli
+if [ ${#} -le 1 ]
+then
+  echo "Usage: generate.sh <openapi.yaml> <version>" >&2
+  exit 1
+fi
 
 rm docs -rf
 rm src/main/java/io/github/vrchatapi/*.java
@@ -14,7 +18,7 @@ rm src/main/java/io/github/vrchatapi/model -rf
 --git-user-id=vrchatapi \
 --git-repo-id=vrchatapi-java \
 -o . \
--i https://raw.githubusercontent.com/vrchatapi/specification/gh-pages/openapi.yaml \
+-i "${1}" \
 --http-user-agent="vrchatapi-java"
 
 # Remove unneccesary copy of spec