From 095037b4c525daae7cf1f29be10c2475606e4ccc Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sat, 27 Dec 2025 11:45:37 +0100 Subject: [PATCH 1/7] Update CI --- .github/workflows/ci.yaml | 44 +++++++++++++++++++++++++++++++-------- generate.sh | 8 +++++-- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0a361627..e802f479 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,17 @@ 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 @@ -9,11 +19,19 @@ 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: @@ -21,24 +39,32 @@ jobs: 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 diff --git a/generate.sh b/generate.sh index 4a8cc547..0d1dd0be 100755 --- a/generate.sh +++ b/generate.sh @@ -1,6 +1,10 @@ #!/bin/bash -npm install @openapitools/openapi-generator-cli +if [ ${#} -le 1 ] +then + echo "Usage: generate.sh " >&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 From 8249970eba1538efc47d6c563b595a1ea72436de Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sat, 27 Dec 2025 11:50:02 +0100 Subject: [PATCH 2/7] Update workflow version --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9d9b3b16..f8a0e1ab 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,9 +19,9 @@ jobs: matrix: java: [ '8' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} distribution: 'temurin' From 23f3ccadd44016b59ed05bc5f00840c220323044 Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sat, 27 Dec 2025 12:11:20 +0100 Subject: [PATCH 3/7] Fix issue --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e802f479..74609a24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -63,8 +63,8 @@ jobs: with: branch: main folder: . - commit-message: "Upgrade Java SDK to spec ${{vrchat_sdk_version}}" - tag: ${{vrchat_sdk_version}} + commit-message: "Upgrade Java SDK to spec ${vrchat_sdk_version}" + tag: ${vrchat_sdk_version} # gradle: # runs-on: ubuntu-latest From a2d23b649a22fad8efcbc6e78ba291b73901c19a Mon Sep 17 00:00:00 2001 From: JelleJurre <76777936+jellejurre@users.noreply.github.com> Date: Sun, 28 Dec 2025 01:42:30 +0100 Subject: [PATCH 4/7] Update .github/workflows/ci.yaml Co-authored-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com> --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 74609a24..80cefff6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,9 +21,9 @@ jobs: 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'] }} + 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 From b37cfe1dd6a6700dd8ddd597b46ece87ad4d7536 Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sun, 28 Dec 2025 01:46:37 +0100 Subject: [PATCH 5/7] Remove error from copy --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 80cefff6..e1ee7846 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -51,7 +51,7 @@ jobs: - name: Check version number run: | - vrchat_sdk_version=$(( ${PASSED_VERSION%%.*} + 1)).${PASSED_VERSION#*.}${VERSION_POSTPEND} + vrchat_sdk_version=$(( ${PASSED_VERSION%%.*})).${PASSED_VERSION#*.}${VERSION_POSTPEND} echo "Version is: ${vrchat_sdk_version}" echo "vrchat_sdk_version=$vrchat_sdk_version" >> $GITHUB_ENV From cac134d328933c35bda7cf0e850430c2aad9cd70 Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sun, 28 Dec 2025 01:50:24 +0100 Subject: [PATCH 6/7] Remove version options --- generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 0d1dd0be..dd5b7569 100755 --- a/generate.sh +++ b/generate.sh @@ -1,8 +1,8 @@ #!/bin/bash -if [ ${#} -le 1 ] +if [ ${#} -le 0 ] then - echo "Usage: generate.sh " >&2 + echo "Usage: generate.sh " >&2 exit 1 fi From 8d0f5c9ac18c18d103bde93a00e01c4ca334eff9 Mon Sep 17 00:00:00 2001 From: jellejurre Date: Sun, 28 Dec 2025 01:51:59 +0100 Subject: [PATCH 7/7] Remove version from script call --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e1ee7846..141eea1d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,7 +56,7 @@ jobs: echo "vrchat_sdk_version=$vrchat_sdk_version" >> $GITHUB_ENV - name: Generate SDK Client - run: bash ./generate.sh "${ARTIFACT_NAME}" "${vrchat_sdk_version}" + run: bash ./generate.sh "${ARTIFACT_NAME}" - name: Deploy SDK back into main branch and make tag uses: JamesIves/github-pages-deploy-action@v4