From d8a58ad5a283c6ff29a15b34317d2d9caf24f66d Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Tue, 8 Apr 2025 20:22:40 +0200 Subject: [PATCH 1/5] fixing rest client build --- .github/workflows/main-rest-clients-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-rest-clients-build.yml b/.github/workflows/main-rest-clients-build.yml index d0bab7eb61..2804477ead 100644 --- a/.github/workflows/main-rest-clients-build.yml +++ b/.github/workflows/main-rest-clients-build.yml @@ -18,7 +18,7 @@ jobs: with: node-version: 16 - name: Install openapi generator - run: npm install @openapitools/openapi-generator-cli + run: npm install -g @openapitools/openapi-generator-cli - name: Build clients working-directory: clients run: ./build-clients.sh From 4a4dd9b89a057da09856451018ca619566f4758d Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Tue, 8 Apr 2025 20:26:46 +0200 Subject: [PATCH 2/5] ci fix --- .github/workflows/main-rest-clients-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main-rest-clients-build.yml b/.github/workflows/main-rest-clients-build.yml index 2804477ead..75a1b6c9b4 100644 --- a/.github/workflows/main-rest-clients-build.yml +++ b/.github/workflows/main-rest-clients-build.yml @@ -18,7 +18,9 @@ jobs: with: node-version: 16 - name: Install openapi generator - run: npm install -g @openapitools/openapi-generator-cli + run: | + npm install -g @openapitools/openapi-generator-cli + echo "$(npm bin -g)" >> $GITHUB_PATH - name: Build clients working-directory: clients run: ./build-clients.sh From f609d3025a55c0ff458ab7f6e7fcf29ff6f9d201 Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Tue, 8 Apr 2025 20:33:21 +0200 Subject: [PATCH 3/5] ci fix --- .github/workflows/main-rest-clients-build.yml | 4 ---- clients/build-clients.sh | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-rest-clients-build.yml b/.github/workflows/main-rest-clients-build.yml index 75a1b6c9b4..5c12dee28e 100644 --- a/.github/workflows/main-rest-clients-build.yml +++ b/.github/workflows/main-rest-clients-build.yml @@ -17,10 +17,6 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - name: Install openapi generator - run: | - npm install -g @openapitools/openapi-generator-cli - echo "$(npm bin -g)" >> $GITHUB_PATH - name: Build clients working-directory: clients run: ./build-clients.sh diff --git a/clients/build-clients.sh b/clients/build-clients.sh index bdc7e0497b..e57d76a3a3 100755 --- a/clients/build-clients.sh +++ b/clients/build-clients.sh @@ -1,5 +1,7 @@ #!/bin/bash +npm install -g @openapitools/openapi-generator-cli + # requires openapi-generator installed and accessible in your PATH DIR="$(dirname "${BASH_SOURCE[0]}")" From a0e1ac21242550b19a6b049cb31396961da2f9c2 Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Tue, 8 Apr 2025 20:40:45 +0200 Subject: [PATCH 4/5] ci fix --- .github/workflows/main-rest-clients-build.yml | 4 ++++ clients/build-clients.sh | 20 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main-rest-clients-build.yml b/.github/workflows/main-rest-clients-build.yml index 5c12dee28e..75a1b6c9b4 100644 --- a/.github/workflows/main-rest-clients-build.yml +++ b/.github/workflows/main-rest-clients-build.yml @@ -17,6 +17,10 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 + - name: Install openapi generator + run: | + npm install -g @openapitools/openapi-generator-cli + echo "$(npm bin -g)" >> $GITHUB_PATH - name: Build clients working-directory: clients run: ./build-clients.sh diff --git a/clients/build-clients.sh b/clients/build-clients.sh index e57d76a3a3..3256f746e4 100755 --- a/clients/build-clients.sh +++ b/clients/build-clients.sh @@ -1,53 +1,51 @@ #!/bin/bash -npm install -g @openapitools/openapi-generator-cli - -# requires openapi-generator installed and accessible in your PATH +# requires openapi-generator-cli installed and accessible in your PATH DIR="$(dirname "${BASH_SOURCE[0]}")" SCHEMA="${DIR}/../browserup-proxy.schema.json" # Generate Markdown documentation -rm -rf markdown && openapi-generator generate \ +rm -rf markdown && openapi-generator-cli generate \ -g markdown -i "${SCHEMA}" \ -o markdown # Generate C# (.NET Core) client -rm -rf csharp && openapi-generator generate \ +rm -rf csharp && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g csharp -i "${SCHEMA}" \ -o csharp -c config-csharp.yaml # Generate Java client -rm -rf java && openapi-generator generate \ +rm -rf java && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g java -i "${SCHEMA}" \ -o java -c config-java.yaml # Generate JavaScript client -rm -rf javascript && openapi-generator generate \ +rm -rf javascript && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g javascript -i "${SCHEMA}" \ -o javascript -c config-javascript.yaml # Generate Python client -rm -rf python && openapi-generator generate \ +rm -rf python && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g python -i "${SCHEMA}" \ -o python -c config-python.yaml # Generate Ruby client -rm -rf ruby && openapi-generator generate \ +rm -rf ruby && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g ruby -i "${SCHEMA}" \ -o ruby -c config-ruby.yaml -rm -rf ruby && openapi-generator generate \ +rm -rf ruby && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g ruby -i "${SCHEMA}" \ -o ruby -c config-ruby.yaml -rm -rf go && openapi-generator generate \ +rm -rf go && openapi-generator-cli generate \ --package-name BrowserUpMitmProxyClient \ -g go -i "${SCHEMA}" \ -o go -c config-go.yaml From 1f9671b7e5d594dc29abbec3dc30925f90fbcc5b Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Tue, 8 Apr 2025 20:50:56 +0200 Subject: [PATCH 5/5] cleanup --- .github/workflows/main-rest-clients-build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main-rest-clients-build.yml b/.github/workflows/main-rest-clients-build.yml index 75a1b6c9b4..2804477ead 100644 --- a/.github/workflows/main-rest-clients-build.yml +++ b/.github/workflows/main-rest-clients-build.yml @@ -18,9 +18,7 @@ jobs: with: node-version: 16 - name: Install openapi generator - run: | - npm install -g @openapitools/openapi-generator-cli - echo "$(npm bin -g)" >> $GITHUB_PATH + run: npm install -g @openapitools/openapi-generator-cli - name: Build clients working-directory: clients run: ./build-clients.sh