From fdfc47036448392eccc476cb517a0c856cbf5f38 Mon Sep 17 00:00:00 2001 From: Emanuele Saccomandi Date: Tue, 22 Mar 2022 17:26:19 +0100 Subject: [PATCH 1/3] ci: added linter on java generation --- .github/workflows/generate-java.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/generate-java.yaml b/.github/workflows/generate-java.yaml index 733e09e0..2d96f93a 100644 --- a/.github/workflows/generate-java.yaml +++ b/.github/workflows/generate-java.yaml @@ -136,6 +136,13 @@ jobs: openapi-generator-cli generate -i ./openapi.yaml -g java -o ./generated/java/ -t ./templates/java --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=$ADDITIONAL_PROPERTIES + - id: format-code + uses: axel-op/googlejavaformat-action@v3 + with: + skipCommit: true + args: "--replace" + files: "./generated/java/**/*.java" + - id: create-pr name: Create Pull Request uses: peter-evans/create-pull-request@v3 From b33a8c898b3e6c4b1492741086d44fcbb7d55187 Mon Sep 17 00:00:00 2001 From: Emanuele Saccomandi Date: Wed, 23 Mar 2022 09:46:25 +0100 Subject: [PATCH 2/3] ci: improved java sdk linting --- .github/workflows/generate-java.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-java.yaml b/.github/workflows/generate-java.yaml index 2d96f93a..35a06cdd 100644 --- a/.github/workflows/generate-java.yaml +++ b/.github/workflows/generate-java.yaml @@ -53,6 +53,7 @@ jobs: sudo add-apt-repository ppa:rmescandon/yq -y sudo apt update sudo apt install yq -y + sudo apt install jq -y cd ./scripts/ yarn cd ../generated/java/scripts @@ -135,13 +136,16 @@ jobs: USER_AGENT="$APP_NAME/${{ env.sdk_version }}/Java-SDK" openapi-generator-cli generate -i ./openapi.yaml -g java -o ./generated/java/ -t ./templates/java --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=$ADDITIONAL_PROPERTIES + + - id: download-linter + name: Download Java Linter + run: | + LAST_VERSION_LINK = curl -s https://api.github.com/repos/google/google-java-format/releases/latest | jq -r ".assets[] | select(.name | test(\"all-deps\")) | .browser_download_url" + curl -o linter.jar - id: format-code - uses: axel-op/googlejavaformat-action@v3 - with: - skipCommit: true - args: "--replace" - files: "./generated/java/**/*.java" + name: Format Code + run: java -jar ./linter.jar --replace ./generated/java/**/*.java - id: create-pr name: Create Pull Request From 4e2a20744b9d003344bd878b3e72a515ec3c852e Mon Sep 17 00:00:00 2001 From: Emanuele Saccomandi Date: Tue, 29 Mar 2022 17:31:27 +0200 Subject: [PATCH 3/3] ci: fixed java generation linter downloading --- .github/workflows/generate-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-java.yaml b/.github/workflows/generate-java.yaml index 35a06cdd..338876e2 100644 --- a/.github/workflows/generate-java.yaml +++ b/.github/workflows/generate-java.yaml @@ -141,7 +141,7 @@ jobs: name: Download Java Linter run: | LAST_VERSION_LINK = curl -s https://api.github.com/repos/google/google-java-format/releases/latest | jq -r ".assets[] | select(.name | test(\"all-deps\")) | .browser_download_url" - curl -o linter.jar + curl ${LAST_VERSION_LINK} -o linter.jar - id: format-code name: Format Code