From ed16b43383fb083cb9352e3d11cc8980be00d448 Mon Sep 17 00:00:00 2001 From: Matt Desmond Date: Fri, 24 Apr 2020 12:41:22 -0400 Subject: [PATCH 1/6] Create java-prettier.yml --- .github/workflows/java-prettier.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/java-prettier.yml diff --git a/.github/workflows/java-prettier.yml b/.github/workflows/java-prettier.yml new file mode 100644 index 0000000000..7e315ac3f7 --- /dev/null +++ b/.github/workflows/java-prettier.yml @@ -0,0 +1,20 @@ +name: Prettier for JS Code + +on: [pull_request] + +jobs: + cleanup_tasks: + runs-on: ubuntu-latest + + steps: + - name: Cloning the repository + uses: actions/checkout@v1 + with: + fetch-depth: 1 + - name: Prettify the Java Code + uses: lwerner-lshigh/prettier_action_java@v1.1.1 + with: + prettier_options: '--no-semi --write *.java' + branch: ${{ github.head_ref }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6c3d56f5d11905bb14793677ebec52cbc19a9672 Mon Sep 17 00:00:00 2001 From: Matt Desmond Date: Fri, 24 Apr 2020 12:48:04 -0400 Subject: [PATCH 2/6] Delete java-prettier.yml --- .github/workflows/java-prettier.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/java-prettier.yml diff --git a/.github/workflows/java-prettier.yml b/.github/workflows/java-prettier.yml deleted file mode 100644 index 7e315ac3f7..0000000000 --- a/.github/workflows/java-prettier.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Prettier for JS Code - -on: [pull_request] - -jobs: - cleanup_tasks: - runs-on: ubuntu-latest - - steps: - - name: Cloning the repository - uses: actions/checkout@v1 - with: - fetch-depth: 1 - - name: Prettify the Java Code - uses: lwerner-lshigh/prettier_action_java@v1.1.1 - with: - prettier_options: '--no-semi --write *.java' - branch: ${{ github.head_ref }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From df9e7c11cdf2d9cbbac2be95de9d89d50f957214 Mon Sep 17 00:00:00 2001 From: Matt Desmond Date: Fri, 24 Apr 2020 12:50:23 -0400 Subject: [PATCH 3/6] Create main.yml --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..9ba109b5c8 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,17 @@ +# Example workflow +name: Format + +on: + push: + branches: + - master + +jobs: + + formatting: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 # v2 minimum required + - uses: axel-op/googlejavaformat-action@v2.0.0 + with: + args: "--skip-sorting-imports --replace" From a77818e4c719d4c61ad81df824f77afbc1d2f5a0 Mon Sep 17 00:00:00 2001 From: Matt Desmond Date: Fri, 24 Apr 2020 12:51:08 -0400 Subject: [PATCH 4/6] Delete main.yml --- .github/workflows/main.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 9ba109b5c8..0000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Example workflow -name: Format - -on: - push: - branches: - - master - -jobs: - - formatting: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 # v2 minimum required - - uses: axel-op/googlejavaformat-action@v2.0.0 - with: - args: "--skip-sorting-imports --replace" From 76fb5ee844b063e376567633af1aac286ac148c1 Mon Sep 17 00:00:00 2001 From: Matt Desmond Date: Fri, 24 Apr 2020 14:03:41 -0400 Subject: [PATCH 5/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 40efacc879..0837bc3e38 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,5 @@ The `jenkins` directory contains an example of the `Jenkinsfile` (i.e. Pipeline) you'll be creating yourself during the tutorial and the `scripts` subdirectory contains a shell script with commands that are executed when Jenkins processes the "Deliver" stage of your Pipeline. + +Adding a change to the README file. From 95e05600329f6458e52e601ac3e9b2a9e632ffca Mon Sep 17 00:00:00 2001 From: Matt Desmond Date: Fri, 24 Apr 2020 14:05:40 -0400 Subject: [PATCH 6/6] Update App.java --- src/main/java/com/mycompany/app/App.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mycompany/app/App.java b/src/main/java/com/mycompany/app/App.java index 5a6d57214d..df6ab8b54e 100644 --- a/src/main/java/com/mycompany/app/App.java +++ b/src/main/java/com/mycompany/app/App.java @@ -6,14 +6,14 @@ public class App { - private final String message = "Hello World!"; + /** private final String message = "Hello World!"; public App() {} public static void main(String[] args) { System.out.println(new App().getMessage()); } - +*/ private final String getMessage() { return message; }