Skip to content

Commit ea465ac

Browse files
committed
ci: run the generator from its jar instead of an npm wrapper
1 parent 5334bc1 commit ea465ac

6 files changed

Lines changed: 5 additions & 2613 deletions

File tree

.github/workflows/build.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ jobs:
2222
repository: vrchatapi/vrchatapi-python
2323
ref: ${{ inputs.ref || github.ref }}
2424

25-
- uses: vrchatapi/specification/.github/actions/setup@ci/modernise-actions
25+
- uses: vrchatapi/specification/.github/actions/generator@ci/modernise-actions
26+
27+
- uses: vrchatapi/specification/.github/actions/bundle@ci/modernise-actions
2628
with:
2729
bundle: openapi-legacy.yaml
28-
generator: 6.2.1
2930

3031
- uses: actions/setup-python@v7
3132
with:

.github/workflows/ci.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,9 @@ jobs:
2626
PASSED_VERSION: ${{ (github.event_name == 'repository_dispatch' && github.event.client_payload || fromJSON(inputs.json))['version'] }}
2727
VERSION_POSTPEND: ${{ github.event_name == 'workflow_dispatch' && inputs.version_postfix || '' }}
2828
steps:
29-
- uses: actions/setup-node@v7
30-
with:
31-
node-version: 24
32-
3329
- uses: actions/checkout@v7
3430

35-
- name: 'Cache node_modules'
36-
uses: actions/cache@v6
37-
with:
38-
path: node_modules
39-
key: ${{ runner.os }}-node-v16-${{ hashFiles('**/generate.sh') }}
40-
restore-keys: |
41-
${{ runner.os }}-node-v16
42-
43-
- name: Install OpenAPI Generator CLI
44-
run: npm install @openapitools/openapi-generator-cli
45-
46-
- name: Set OpenAPI Generator version
47-
run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 6.2.1
31+
- uses: vrchatapi/specification/.github/actions/generator@ci/modernise-actions
4832

4933
- name: Set up Python 3.14
5034
uses: actions/setup-python@v7

generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ then
77
fi
88
rm vrchatapi docs -rf
99

10-
./node_modules/\@openapitools/openapi-generator-cli/main.js generate \
10+
openapi-generator generate \
1111
-g python-legacy \
1212
--additional-properties=packageName=vrchatapi,projectName=vrchatapi \
1313
--git-user-id=vrchatapi \

openapitools.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
32
"spaces": 2,
43
"generator-cli": {
54
"version": "6.2.1"

0 commit comments

Comments
 (0)