Skip to content

Commit 19fd8eb

Browse files
authored
chore: fix formatting and linting action (#174)
* chore: fix formatting and linting action * fix formatting in DeployFunction.java
1 parent 3b7b701 commit 19fd8eb

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

.github/workflows/lint.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,12 @@ jobs:
2525
formatting:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v2 # v2 minimum required
28+
- uses: actions/checkout@v3 # v2 minimum required
2929
- name: Run formatter
3030
id: formatter
3131
uses: axel-op/googlejavaformat-action@v3
3232
with:
33-
args: "--dry-run --set-exit-if-changed"
34-
continue-on-error: true
35-
- name: Check for failure
36-
if: steps.formatter.outcome != 'success'
37-
run: |
38-
echo "Java format check failed, see 'Run formatter' step for more information."
39-
echo "See https://github.com/google/google-java-format for options on running the formatter locally."
40-
exit 1
33+
args: "--replace"
34+
skip-commit: true
35+
- name: Print diffs
36+
run: git --no-pager diff --exit-code

function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,10 @@ public class DeployFunction extends CloudSdkMojo {
212212
*/
213213
@Parameter(alias = "deploy.buildenvvarsfile", property = "function.deploy.buildenvvarsfile")
214214
String buildEnvVarsFile;
215-
/**
216-
* If true, deploys the function in the 2nd Generation Environment.
217-
*/
215+
/** If true, deploys the function in the 2nd Generation Environment. */
218216
@Parameter(alias = "deploy.gen2", property = "function.deploy.gen2", defaultValue = "false")
219217
boolean gen2;
220-
218+
221219
boolean hasEnvVariables() {
222220
return (this.environmentVariables != null && !this.environmentVariables.isEmpty());
223221
}

0 commit comments

Comments
 (0)