From b79e402d7e2c5a38a32f7d88ae7c741d91f30feb Mon Sep 17 00:00:00 2001 From: KeanzKun Date: Tue, 5 Sep 2023 17:49:17 +0800 Subject: [PATCH 1/5] Kean commit --- src/main/resources/templates/vets/vetList.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/templates/vets/vetList.html b/src/main/resources/templates/vets/vetList.html index e0b8e7050..3005ee042 100644 --- a/src/main/resources/templates/vets/vetList.html +++ b/src/main/resources/templates/vets/vetList.html @@ -6,6 +6,7 @@

Veterinarians

+

Operated by Kean

From 985d902b979693de9ad2a80a6b0320e25517200f Mon Sep 17 00:00:00 2001 From: KoonQi Date: Tue, 5 Sep 2023 18:31:54 +0800 Subject: [PATCH 2/5] change .yml file --- .github/workflows/build.yml | 2 +- .github/workflows/maven-build.yml | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 .github/workflows/maven-build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d5ef12a4..35b33035e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: ['17'] - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml deleted file mode 100644 index 5de223fc6..000000000 --- a/.github/workflows/maven-build.yml +++ /dev/null @@ -1,29 +0,0 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - matrix: - java: [ '17' ] - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{matrix.java}} - uses: actions/setup-java@v2 - with: - java-version: ${{matrix.java}} - distribution: 'adopt' - cache: maven - - name: Build with Maven Wrapper - run: ./mvnw -B package From 1f573e815686b61647de05a7c7634e5674ac422d Mon Sep 17 00:00:00 2001 From: KoonQi Date: Tue, 5 Sep 2023 18:34:09 +0800 Subject: [PATCH 3/5] editted .yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35b33035e..5d5ef12a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v2 with: - java-version: ['17'] + java-version: '17' - name: Build with Maven run: mvn -B package --file pom.xml From 854208c00bb29f02c1f4a62accf7fb9877237d74 Mon Sep 17 00:00:00 2001 From: KoonQi Date: Tue, 5 Sep 2023 18:36:03 +0800 Subject: [PATCH 4/5] edit .yml again --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d5ef12a4..f9b0a1f2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build and Test on: push: - branches: [ main ] + branches: [main] jobs: build: @@ -16,9 +16,10 @@ jobs: uses: actions/setup-java@v2 with: java-version: '17' + distribution: 'adopt' - name: Build with Maven run: mvn -B package --file pom.xml - name: Run tests with Maven - run: mvn -B test --file pom.xml \ No newline at end of file + run: mvn -B test --file pom.xml From b8138330e2fbc6558ffe4ccd1316161aeb2135b7 Mon Sep 17 00:00:00 2001 From: KeanzKun Date: Tue, 5 Sep 2023 18:43:42 +0800 Subject: [PATCH 5/5] Kean commit --- src/main/resources/templates/vets/vetList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/vets/vetList.html b/src/main/resources/templates/vets/vetList.html index 3005ee042..152b9d5f6 100644 --- a/src/main/resources/templates/vets/vetList.html +++ b/src/main/resources/templates/vets/vetList.html @@ -6,7 +6,7 @@

Veterinarians

-

Operated by Kean

+

Powered by Kean