Skip to content

Commit 7d13101

Browse files
committed
ci: run the generator from its jar instead of an npm wrapper
1 parent 093581b commit 7d13101

6 files changed

Lines changed: 5 additions & 2978 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-csharp
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: 7.17.0
2930

3031
- uses: actions/setup-dotnet@v6
3132
with:

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,8 @@ 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
34-
- name: 'Cache node_modules'
35-
uses: actions/cache@v6
36-
with:
37-
path: node_modules
38-
key: ${{ runner.os }}-node-v22-${{ hashFiles('**/generate.sh') }}
39-
restore-keys: |
40-
${{ runner.os }}-node-v22
41-
42-
- name: Install OpenAPI Generator CLI
43-
run: npm install @openapitools/openapi-generator-cli
44-
45-
- name: Set OpenAPI Generator version
46-
run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 7.17.0
30+
- uses: vrchatapi/specification/.github/actions/generator@ci/modernise-actions
4731

4832
- name: Setup NuGet
4933
uses: NuGet/setup-nuget@v4.0

‎generate.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88

99
rm src docs *.nupkg *.snupkg -rf
1010

11-
./node_modules/\@openapitools/openapi-generator-cli/main.js generate \
11+
openapi-generator generate \
1212
-g csharp \
1313
-t ./templates \
1414
--library httpclient \

‎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": "7.17.0"

0 commit comments

Comments
 (0)