Ci/modernise actions

.github/workflows/ci.yaml

@@ -1,79 +1,101 @@
 on:
+  push:
+    branches:
+      - '**'
+  pull_request:
   repository_dispatch:
     types: [release]
   workflow_dispatch:
     inputs:
       json:
-        description: 'Passed json from repository_dispatch'
+        description: Passed json from repository_dispatch
         required: true
         type: string
       version_postfix:
-        description: 'Additional string to concatenate onto the existing version before release'
+        description: Additional string to concatenate onto the existing version before release
         required: false
         type: string
         default: ''
+  workflow_call:
+    inputs:
+      ref:
+        description: Ref of this repository to build.
+        required: false
+        type: string
+        default: main
 
-name: Generate VRChat API SDK
+name: CI
+
+env:
+  PASSED_VERSION: ${{ (github.event_name == 'repository_dispatch' && github.event.client_payload || fromJSON(inputs.json || '{}'))['version'] }}
+  VERSION_POSTPEND: ${{ github.event_name == 'workflow_dispatch' && inputs.version_postfix || '' }}
 
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Generate VRChat API SDK
-    env:
-      ARTIFACT_NAME: "openapi.yaml"
-      INPUT: ${{ github.event_name == 'repository_dispatch' && toJSON(github.event.client_payload) || inputs.json }}
-      SPEC_URL: ${{ (github.event_name == 'repository_dispatch' && github.event.client_payload || fromJSON(inputs.json))['artifacts']['openapi-legacy.yaml'] }}
-      PASSED_VERSION: ${{ (github.event_name == 'repository_dispatch' && github.event.client_payload || fromJSON(inputs.json))['version'] }}
-      VERSION_POSTPEND: ${{ github.event_name == 'workflow_dispatch' && inputs.version_postfix || '' }}
     steps:
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v7
         with:
-          node-version: 16
+          repository: vrchatapi/vrchatapi-java
+          ref: ${{ inputs.ref || github.ref }}
+
+      - uses: vrchatapi/specification/.github/actions/setup-generator@main
+
+      - uses: vrchatapi/specification/.github/actions/download@main
+        with:
+          bundle: openapi-legacy.yaml
+
+      - if: env.VERSION_POSTPEND != ''
+        run: yq '--inplace' ".info.version |= \"${PASSED_VERSION}${VERSION_POSTPEND}\"" openapi-legacy.yaml
+
+      - run: bash ./generate.sh openapi-legacy.yaml
 
-      - uses: actions/checkout@v3
+      - uses: actions/upload-artifact@v7
+        with:
+          name: java-generated
+          path: .
+          include-hidden-files: true
 
-      - name: 'Cache node_modules'
-        uses: actions/cache@v3
+  test:
+    needs: generate
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['17', '21']
+    steps:
+      - uses: actions/download-artifact@v8
         with:
-          path: node_modules
-          key: ${{ runner.os }}-node-v16-${{ hashFiles('**/generate.sh') }}
-          restore-keys: |
-            ${{ runner.os }}-node-v16
+          name: java-generated
 
-      - name: Install OpenAPI Generator CLI
-        run: npm install @openapitools/openapi-generator-cli
+      - uses: actions/setup-java@v5.7.0
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: temurin
+          cache: maven
 
-      - name: Set OpenAPI Generator version
-        run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 7.24.0
+      - run: mvn -B package --no-transfer-progress
 
-      - name: Download Specification
-        run: wget "${SPEC_URL}" '--output-document' "${ARTIFACT_NAME}"
+  publish:
+    needs:
+      - generate
+      - test
+    if: github.repository == 'vrchatapi/vrchatapi-java'
+      && (github.event_name == 'repository_dispatch' || github.event_name == 'workflow_dispatch')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          repository: vrchatapi/vrchatapi-java
 
-      - name: Apply Version Postpend
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.version_postfix != '' }}
-        run: yq '--inplace' ".info.version |= \"${{ env.PASSED_VERSION}}${{ env.VERSION_POSTPEND }}\"" "${ARTIFACT_NAME}"
+      - uses: actions/download-artifact@v8
+        with:
+          name: java-generated
 
-      - name: Generate SDK Client
-        run: bash ./generate.sh "${ARTIFACT_NAME}"
+      - run: rm -f openapi-legacy.yaml
 
-      - name: Deploy SDK back into main branch and make tag
-        uses: JamesIves/github-pages-deploy-action@v4
+      - uses: JamesIves/github-pages-deploy-action@v4.9.0
         with:
           branch: main
           folder: .
-          commit-message: "Upgrade Java SDK to spec ${{ env.PASSED_VERSION}}${{ env.VERSION_POSTPEND }}"
-          tag: ${{ env.PASSED_VERSION}}${{ env.VERSION_POSTPEND }}
-
-#  gradle:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Set up JDK 13
-#        uses: actions/setup-java@v2
-#        with:
-#          java-version: '13'
-#          distribution: 'adopt'
-#      - name: Validate Gradle wrapper
-#        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-#      - name: Build with Gradle
-#        run: chmod ugo+x gradlew; ./gradlew build
+          commit-message: Upgrade Java SDK to spec ${{ env.PASSED_VERSION }}${{ env.VERSION_POSTPEND }}
+          tag: ${{ env.PASSED_VERSION }}${{ env.VERSION_POSTPEND }}

generate.sh

@@ -12,7 +12,7 @@ rm src/main/java/io/github/vrchatapi/api -rf
 rm src/main/java/io/github/vrchatapi/auth -rf
 rm src/main/java/io/github/vrchatapi/model -rf
 
-./node_modules/\@openapitools/openapi-generator-cli/main.js generate \
+openapi-generator generate \
 -g java \
 --global-property skipFormModel=false \
 --additional-properties=groupId=io.github.vrchatapi,apiPackage=io.github.vrchatapi.api,invokerPackage=io.github.vrchatapi,modelPackage=io.github.vrchatapi.model,artifactId=vrchatapi,licenseName=MIT,licenseUrl=https://github.com/vrchatapi/vrchatapi-java/blob/main/LICENSE,developerEmail=me@ruby.js.org,developerName=VRChatAPI,developerOrganization=vrchatapi,developerOrganizationUrl=https://github.com/VRChatAPI,hideGenerationTimestamp=true \

openapitools.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
     "version": "7.24.0"